From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Jan 2009 16:17:41 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.29-rc2~91
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=51eb9ab91abc9c384118b1d947e4b99cc2bc5fc5;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:
  pata_it821x: Update RDC UDMA handling
  ata: fix wrong WARN_ON_ONCE
---

51eb9ab91abc9c384118b1d947e4b99cc2bc5fc5