Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2009 16:17:41 +0000 (08:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2009 16:17:41 +0000 (08:17 -0800)
commit51eb9ab91abc9c384118b1d947e4b99cc2bc5fc5
treec34c42989947ef97adb669fb36153951ea2e2f86
parent288e4877f94a3b144aadc206e7796921d02432c1
parent4a99d95fa836e254d17910e52663ba2be7b880e7
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:
  pata_it821x: Update RDC UDMA handling
  ata: fix wrong WARN_ON_ONCE