]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bb7ff7 005b1f7)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 May 2008 16:52:45 +0000 (09:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 May 2008 16:52:45 +0000 (09:52 -0700)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] revert new check-ready Status register logic


Trivial merge
Linux 2.6 source tree