]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62ad36a 3ec25eb)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Mar 2008 21:26:27 +0000 (14:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Mar 2008 21:26:27 +0000 (14:26 -0700)
commita77df5cd1cde203ef11c8e5a3ca47def5f5a1687
treeb509b7eaec506cccdadb125c104b76c796c0151atree | snapshot
parent62ad36a8a6541de82984e4f1a6cff09535d68098commit | diff
parent3ec25ebd69dc120d0590e64caaf1477aa88c8a93commit | 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
Linux 2.6 source tree