summaryrefslogtreecommitdiff
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 16:08:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 16:08:11 -0700
commit969907a956752f88dde4aa23fa8c033b9a939aee (patch)
treee131db71d1db9a3b8591d718e8c5e897daadccec /init/Kconfig
parentea541686d8454efac4f2b5c0767affb12d4b6a52 (diff)
parentfa3fd7204e1a4e8538117f0edbfecd4132276860 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: drivers/ide/generic.c -> drivers/ide/ide-pci-generic.c ide-disk: set non-rotational queue flag for SSD and CF devices ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list ide: Add tx4938ide driver (v2) TXx9: Add TX4938 ATA support (v3) ide: Add tx4939ide driver (v6) ide: two more pci_ioremap_bar() conversions pci: use pci_ioremap_bar() in drivers/ide sgiioc4: use ide_host_add() (take 2) sgiioc4: fix error cleanup path (take 2)
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions