| commit | 5ae115af1dd47734b8f5ecc30b34b7b594b87c57 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 22 08:22:39 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 22 08:22:39 2009 -0700 |
| tree | be3d405c723997255c5333b5b7c64fdf751c55d7 | |
| parent | a15ae93ff7c710191362978453f306943808298d [diff] | |
| parent | 5993856e53fbc4b4f28e2d481deaebeb715b1267 [diff] |
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)