Linus Torvalds cbb51afa6d Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (24 commits) pci: allow multiple calls to pcim_enable_device() Blackfin pata-bf54x driver: fix compiling bug - no ata_port struct in struct ata_device any more Blackfin pata-bf54x driver: should cover all possible interrupt sources Blackfin pata-bf54x driver: Add debug information Blackfin pata-bf54x driver: Remove obsolete PM function pata_sl82c105: dual channel support ata_piix.c: make piix_merge_scr() static sata_nv: fix for completion handling sata_mv: Remove PCI dependency sata_mv ncq Comments and version bump sata_mv ncq Remove post internal cmd op sata_mv ncq Enable NCQ operation sata_mv ncq Introduce per-tag SG tables ata_piix: IDE mode SATA patch for Intel ICH10 DeviceID's ahci: RAID mode SATA patch for Intel ICH10 DeviceID's sata_mv ncq Use DMA memory pools for hardware memory tables sata_mv ncq Restrict max sectors to 8-bits on GenII NCQ sata_mv ncq Ignore response status LSB on NCQ sata_mv ncq Use hqtag instead of ioid sata_mv ncq Add want ncq parameter for EDMA configuration ...		2008-02-02 08:47:54 +11:00
..
acorn/char
acpi	x86: don't disable TSC in any C states on AMD Fam10h	2008-01-30 13:32:41 +01:00
amba
ata	Blackfin pata-bf54x driver: fix compiling bug - no ata_port struct in struct ata_device any more	2008-02-01 12:26:43 -05:00
atm
auxdisplay
base	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6	2008-01-31 09:31:37 +11:00
block	block/sunvdc.c:print_version() must be __devinit	2008-02-01 09:26:32 +01:00
bluetooth
cdrom
char	[AUDIT] add session id to audit messages	2008-02-01 14:06:51 -05:00
clocksource
connector
cpufreq	cpufreq: fix obvious condition statement error	2008-01-30 13:33:34 +01:00
cpuidle
crypto
dca
dio
dma
edac	Merge branch 'linux-2.6'	2008-01-31 11:25:51 +11:00
eisa
firewire	firewire: fw-sbp2: Use sbp2 device-provided mgt orb timeout for logins	2008-01-30 22:22:29 +01:00
firmware	x86: left over fix for leak of early_ioremp in dmi_scan	2008-01-30 13:33:32 +01:00
hid
hwmon
i2c
ide	ide-cd: fix leftover data BUG	2008-02-01 09:26:33 +01:00
ieee1394	ieee1394: ohci1394: don't schedule IT tasklets on IR events	2008-01-30 22:22:21 +01:00
infiniband	[SCSI] remove use_sg_chaining	2008-01-30 13:14:02 -06:00
input	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
isdn
leds
lguest	lguest: fix mis-merge against hpa's TSS renaming	2008-01-31 19:59:44 +11:00
macintosh	Merge branch 'linux-2.6'	2008-01-31 11:25:51 +11:00
mca
md
media	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
message
mfd
misc
mmc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-02-01 21:06:29 +11:00
nubus
of
oprofile
parisc
parport
pci	pci: allow multiple calls to pcim_enable_device()	2008-02-01 12:26:44 -05:00
pcmcia
pnp	git-x86: drivers/pnp/pnpbios/bioscalls.c build fix	2008-01-30 13:32:31 +01:00
power
ps3
rapidio	Merge branch 'linux-2.6'	2008-01-31 11:25:51 +11:00
rtc
s390	[SCSI] zfcp: fix sense_buffer access bug	2008-01-30 13:03:39 -06:00
sbus
scsi	[SCSI] Revert "[SCSI] aacraid: fib context lock for management ioctls"	2008-01-30 13:14:26 -06:00
serial	m68knommu: use container_of in mcf.c	2008-02-01 21:00:01 +11:00
sh
sn
spi	Merge branch 'linux-2.6'	2008-01-31 11:25:51 +11:00
ssb	ssb: Add boardflags_hi field to the sprom data structure	2008-01-28 15:09:52 -08:00
tc
telephony
uio
usb	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
video	x86: cpa: move flush to cpa	2008-01-30 13:34:07 +01:00
virtio
w1
watchdog	[WATCHDOG] use SGI_HAS_INDYDOG for INDYDOG depends	2008-01-29 12:58:38 +00:00
xen
zorro
Kconfig	KVM: Move arch dependent files to new directory arch/x86/kvm/	2008-01-30 18:01:18 +02:00
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2008-01-31 09:35:32 +11:00