From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Oct 2008 21:27:57 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.27-rc9~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f1ea7254726d25a333056619ec6b1a8ee1b7358d;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: workaround for bogus gcc warning in ide_sysfs_register_port()
  ide-cd: Optiarc DVD RW AD-7200A does play audio
  IDE: Fix platform device registration in Swarm IDE driver (v2)
  ide-dma: fix ide_build_dmatable() for TRM290
  ide-cd: temporary tray close fix
---

f1ea7254726d25a333056619ec6b1a8ee1b7358d