tree ad0a6307890595172406fda45ec763f7a6bb8686
parent ba9b0c11285bcdaa3243c4123e924094b626c740
parent ca09a237b8c6b053e101a4a83bc30d2c48435bd5
author Linus Torvalds <torvalds@linux-foundation.org> 1223328477 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223328477 -0700

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