tree c34c42989947ef97adb669fb36153951ea2e2f86
parent 288e4877f94a3b144aadc206e7796921d02432c1
parent 4a99d95fa836e254d17910e52663ba2be7b880e7
author Linus Torvalds <torvalds@linux-foundation.org> 1231863461 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231863461 -0800

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