| commit | a77df5cd1cde203ef11c8e5a3ca47def5f5a1687 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 30 14:26:27 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 30 14:26:27 2008 -0700 |
| tree | b509b7eaec506cccdadb125c104b76c796c0151a | |
| parent | 62ad36a8a6541de82984e4f1a6cff09535d68098 [diff] | |
| parent | 3ec25ebd69dc120d0590e64caaf1477aa88c8a93 [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: libata: ATA_EHI_LPM should be ATA_EH_LPM pata_sil680: only enable MMIO on Cell blades