1. 24 Jun, 2006 34 commits
  2. 23 Jun, 2006 6 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 6edad161
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (258 commits)
        [libata] conversion to new debug scheme, part 1 of $N
        [PATCH] libata: Add ata_scsi_dev_disabled
        [libata] Add host lock to struct ata_port
        [PATCH] libata: implement per-dev EH action mask eh_info->dev_action[]
        [PATCH] libata-dev: move the CDB-intr DMA blacklisting
        [PATCH] ahci: disable NCQ support on vt8251
        [libata] ahci: add JMicron PCI IDs
        [libata] sata_nv: add PCI IDs
        [libata] ahci: Add NVIDIA PCI IDs.
        [PATCH] libata: convert several bmdma-style controllers to new EH, take #3
        [PATCH] sata_via: convert to new EH, take #3
        [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler
        [PATCH] sata_nv: add hotplug support
        [PATCH] sata_nv: convert to new EH
        [PATCH] sata_nv: better irq handlers
        [PATCH] sata_nv: simplify constants
        [PATCH] sata_nv: kill struct nv_host_desc and nv_host
        [PATCH] sata_nv: kill not-working hotplug code
        [libata] Update docs to reflect current driver API
        [PATCH] libata: add host_set->next for legacy two host_sets case, take #3
        ...
      6edad161
    • Tony Luck's avatar
      [IA64] fix ia64 build (fadt_descriptor) · 236ee8c3
      Tony Luck authored
      arch/ia64/kernel/acpi.c got forgotten when include/acpi/actbl.h
      got a cleanup.
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      236ee8c3
    • Tony Luck's avatar
      Auto-update from upstream · 8cf60e04
      Tony Luck authored
      8cf60e04
    • Nicolas Pitre's avatar
      [PATCH] fix silly ARM non-EABI build error · 95eaa5fa
      Nicolas Pitre authored
      My bad.
      Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      95eaa5fa
    • Andrew Morton's avatar
      [PATCH] s390_hypfs filesystem: get_sb_single() fix · a5cf4b9a
      Andrew Morton authored
      Update hypfs for dhowells API changes.
      
      Cc: Pekka Enberg <penberg@cs.helsinki.fi>
      Cc: Ingo Oeser <ioe-lkml@rameria.de>
      Cc: Joern Engel <joern@wohnheim.fh-wedel.de>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Cc: Michael Holzheu <holzheu@de.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      a5cf4b9a
    • Andrew Morton's avatar
      [PATCH] cpufreq build fix · 138a0128
      Andrew Morton authored
      drivers/cpufreq/cpufreq_ondemand.c: In function 'do_dbs_timer':
      drivers/cpufreq/cpufreq_ondemand.c:374: warning: implicit declaration of function 'lock_cpu_hotplug'
      drivers/cpufreq/cpufreq_ondemand.c:381: warning: implicit declaration of function 'unlock_cpu_hotplug'
      drivers/cpufreq/cpufreq_conservative.c: In function 'do_dbs_timer':
      drivers/cpufreq/cpufreq_conservative.c:425: warning: implicit declaration of function 'lock_cpu_hotplug'
      drivers/cpufreq/cpufreq_conservative.c:432: warning: implicit declaration of function 'unlock_cpu_hotplug'
      
      Cc: Dave Jones <davej@codemonkey.org.uk>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      138a0128