diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:38:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:38:06 -0700 |
| commit | 8019aa946af5218bc4446c21e43cc19c9401ac68 (patch) | |
| tree | 6681b73a560f5a4e4a4e8f97b3833a087a488439 /include/asm-m68k/sun3xprom.h | |
| parent | 73e3e6481f56b3b5b618671a8d32b19a35f84316 (diff) | |
| parent | 48feb3c419508487becfb9ea3afcc54c3eac6d80 (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: (79 commits)
ata-acpi: don't call _GTF for disabled drive
sata_mv add temporary 3 second init delay for SiliconImage PMs
sata_mv remove redundant edma init code
sata_mv add basic port multiplier support
sata_mv fix SOC flags, enable NCQ on SOC
sata_mv disable hotplug for now
sata_mv cosmetics
sata_mv hardreset rework
[libata] improve Kconfig help text for new PMP, SFF options
libata: make EH fail gracefully if no reset method is available
libata: Be a bit more slack about early devices
libata: cable logic
libata: move link onlineness check out of softreset methods
libata: kill dead code paths in reset path
pata_scc: fix build breakage
libata: make PMP support optional
libata: implement PMP helpers
libata: separate PMP support code from core code
libata: make SFF support optional
libata: don't use ap->ioaddr in non-SFF drivers
...
Diffstat (limited to 'include/asm-m68k/sun3xprom.h')
0 files changed, 0 insertions, 0 deletions