aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/module.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-08 18:46:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-08 18:46:56 -0400
commite228c1b51ef572843827630e643a682ef492b933 (patch)
tree77360b4dadfbe2c33b8c7ef594a4f9494d00f858 /drivers/base/module.c
parenta46add72f79bb8196f07a860adddd312ca398eec (diff)
parent8e48b6b307085ce8a747cf94294742f7b7a11b18 (diff)
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: ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs pata_sil680: remove duplicate pcim_enable_device libata-sff: kill spurious WARN_ON() in ata_hsm_move() sata_nv: disable hardreset for generic ahci: disable PMP for marvell ahcis sata_mv: add RocketRaid 1720 PCI ID to driver ahci, pata_marvell: play nicely together
Diffstat (limited to 'drivers/base/module.c')
0 files changed, 0 insertions, 0 deletions