]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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