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)
commit633331f389c2d9c631371d09a54626a5e4749452
tree6cd80edd1075635c64e612cc48e778e66795ea3a
parent5bb7ff795fffc9418e3039cac77b42adcaae1a57
parent005b1f7495e812b99b73de5adbc73afd7a1cbcaf
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] revert new check-ready Status register logic