diff options
author | 2008-05-19 16:29:29 -0700 | |
---|---|---|
committer | 2008-05-19 16:29:29 -0700 | |
commit | 88e6c9499f959cdac9ef120a1a1e857da5944052 (patch) | |
tree | 282eaabe299f084db582668a16b2f86e0cfbdfec /mm/mm_init.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm (diff) | |
parent | drivers/ata: trim trailing whitespace (diff) | |
download | wireguard-linux-88e6c9499f959cdac9ef120a1a1e857da5944052.tar.xz wireguard-linux-88e6c9499f959cdac9ef120a1a1e857da5944052.zip |
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: (28 commits)
drivers/ata: trim trailing whitespace
Fixups to ATA ACPI hotplug
libata: ignore SIMG4726 config pseudo device
sata_sil24: don't use NCQ if marvell 4140 PMP is attached
libata: don't schedule LPM action seperately during probing
libata: make sure PMP notification is turned off during recovery
libata: increase PMP register access timeout to 3s
libata: ignore recovered PHY errors
libata: kill hotplug related race condition
libata: move reset freeze/thaw handling into ata_eh_reset()
libata: reorganize ata_eh_reset() no reset method path
libata: fix sata_link_hardreset() @online out parameter handling
sata_promise: other cleanups
sata_promise: mmio access cleanups
sata_promise: fix irq clearing buglets
ata: remove FIT() macro
sata_mv: ensure empty request queue for FBS-NCQ EH
sata_mv: cache main_irq_mask register in hpriv
sata_mv: disregard masked irqs
sata_mv: fix pmp drives not found
...
Diffstat (limited to 'mm/mm_init.c')
0 files changed, 0 insertions, 0 deletions