Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 15:22:39 +0000 (08:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 15:22:39 +0000 (08:22 -0700)
commit5ae115af1dd47734b8f5ecc30b34b7b594b87c57
treebe3d405c723997255c5333b5b7c64fdf751c55d7
parenta15ae93ff7c710191362978453f306943808298d
parent5993856e53fbc4b4f28e2d481deaebeb715b1267
Merge branch 'for-linus' of git://git./linux/kernel/git/bart/ide-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  via82cxxx: Add VIA VX855 PCI Device ID
  ide: report timeouts in ide_busy_sleep()
  ide: improve failed opcode reporting
  ide: fix printk() levels in ide_dump_ata[pi]_error()
  ide: fix OOPS during ide-cd error recovery
  ide: fix 40-wire cable detection for TSST SH-S202* ATAPI devices (v2)