Linus Torvalds a68aa1cc6f Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev ... * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (50 commits) [libata] Delete pata_it8172 driver [PATCH] libata: improve handling of diagostic fail (and hardware that misreports it) [PATCH] libata: fix non-uniform ports handling Fix libata resource conflict for legacy mode [libata] ata_piix: build fix [PATCH] pata_amd: Check enable bits on Nvidia [PATCH] Update SiS PATA [libata] Add pata_jmicron driver to Kconfig, Makefile [libata #pata-drivers] Trim trailing whitespace. [libata] Trim trailing whitespace. [libata] Add a bunch of PATA drivers. Rename libata-bmdma.c to libata-sff.c. libata: Grand renaming. Clean up drivers/ata/Kconfig a bit. [PATCH] CONFIG_PM=n slim: drivers/scsi/sata_sil* [PATCH] sata_via: Add SATA support for vt8237a [PATCH] libata: change path to libata in libata.tmpl [PATCH] libata: s/CONFIG_SCSI_SATA/CONFIG_[S]ATA/g in pci/quirks.c libata: Make sure drivers/ata is a separate Kconfig menu [libata] ata_piix: add missing kfree() ...		2006-09-24 10:19:56 -07:00
..
acorn
acpi	Merge trivial low-risk suspend hotkey bugzilla-5918 into release	2006-08-20 21:49:29 -04:00
amba
ata	Merge branch 'master' into upstream	2006-09-24 01:52:47 -04:00
atm	[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE	2006-09-22 14:53:53 -07:00
base	[S390] hypfs comment cleanup.	2006-09-20 15:58:44 +02:00
block	Merge mulgrave-w:git/scsi-misc-2.6	2006-09-23 15:33:43 -05:00
bluetooth
cdrom	[PATCH] cdrom/gdsc: fix printk format warning	2006-08-27 11:01:33 -07:00
char	[PATCH] briq_panel: read() and write() get __user pointers, damnit	2006-09-23 11:34:43 -07:00
clocksource
connector
cpufreq	[CPUFREQ] Fix some more CPU hotplug locking.	2006-09-22 19:15:23 -04:00
crypto	[CRYPTO] padlock: Convert padlock-sha to use crypto_hash	2006-09-21 11:46:22 +10:00
dio
dma
edac
eisa
fc4
firmware
hwmon	[PATCH] hwmon: abituguru timeout fixes	2006-08-26 13:05:19 -07:00
i2c	Merge branch 'merge'	2006-08-31 15:45:48 +10:00
ide	[POWERPC] Fix ohare IDE irq workaround on old powermacs	2006-09-22 15:19:58 +10:00
ieee1394	[PATCH] 1394: fix for recently added firewire patch that breaks things on ppc	2006-08-27 11:01:28 -07:00
infiniband	Merge mulgrave-w:git/linux-2.6	2006-09-23 21:03:52 -05:00
input	Input: psmouse - fix Intellimouse 4.0 initialization	2006-08-23 00:48:03 -04:00
isdn
leds
macintosh	[PATCH] asm/backlight.h is ppc-only	2006-09-22 17:48:57 -07:00
mca
md	[BLOCK] dm-crypt: trivial comment improvements	2006-09-21 11:46:27 +10:00
media	V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules	2006-09-10 13:46:01 -03:00
message	[SCSI] scsi_transport_sas: remove local_attached flag	2006-08-27 22:30:11 -05:00
mfd
misc
mmc	[MMC] Always use a sector size of 512 bytes	2006-09-07 16:01:30 +01:00
mtd	[MTD] Whitespace cleanup in SSFDC driver.	2006-09-23 16:20:48 +01:00
net	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2006-09-24 10:15:13 -07:00
nubus
oprofile
parisc
parport
pci	Merge branch 'master' into upstream	2006-09-24 01:52:47 -04:00
pcmcia
pnp
rapidio
rtc	[PATCH] rtc-s3c.c: fix time setting checks	2006-08-27 11:01:28 -07:00
s390	[SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down	2006-09-23 18:01:46 -05:00
sbus	[OPENPROMIO]: Handle current_node being NULL correctly.	2006-09-18 01:47:13 -07:00
scsi	Merge branch 'master' into upstream	2006-09-24 01:52:47 -04:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-09-22 12:48:03 -07:00
sh
sn
spi
tc
telephony
usb	[PATCH] fallout from hcd-core patch	2006-09-22 17:48:57 -07:00
video	[PATCH] more get_property() fallout	2006-09-23 11:34:43 -07:00
w1
zorro
Kconfig
Makefile