From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2009 15:22:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~30345
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5ae115af1dd47734b8f5ecc30b34b7b594b87c57;p=mirror_ubuntu-focal-kernel.git

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)
---

5ae115af1dd47734b8f5ecc30b34b7b594b87c57