Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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)