From: Linus Torvalds Date: Sun, 11 May 2008 16:52:45 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Tag: v2.6.26-rc2~5 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=633331f389c2d9c631371d09a54626a5e4749452;p=linux-2.6-omap-h63xx.git 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] revert new check-ready Status register logic --- 633331f389c2d9c631371d09a54626a5e4749452