diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-30 23:26:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-30 23:26:27 +0200 |
| commit | a77df5cd1cde203ef11c8e5a3ca47def5f5a1687 (patch) | |
| tree | b509b7eaec506cccdadb125c104b76c796c0151a /drivers/sn | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| parent | libata: ATA_EHI_LPM should be ATA_EH_LPM (diff) | |
| download | linux-a77df5cd1cde203ef11c8e5a3ca47def5f5a1687.tar.xz linux-a77df5cd1cde203ef11c8e5a3ca47def5f5a1687.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:
libata: ATA_EHI_LPM should be ATA_EH_LPM
pata_sil680: only enable MMIO on Cell blades
Diffstat (limited to 'drivers/sn')
0 files changed, 0 insertions, 0 deletions