diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 16:29:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 16:29:29 -0700 |
| commit | 88e6c9499f959cdac9ef120a1a1e857da5944052 (patch) | |
| tree | 282eaabe299f084db582668a16b2f86e0cfbdfec /arch/sh/kernel/entry-common.S | |
| parent | 8c4bab3a1aadaf4e38b2bfaf557eab74322a9fd4 (diff) | |
| parent | c85665ffa8e351a5b38f8e4ceaec527d8783c970 (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: (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 'arch/sh/kernel/entry-common.S')
0 files changed, 0 insertions, 0 deletions