From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Feb 2009 03:23:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.29-rc4~71
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=017f51788ffdc16b0168143e38ea2c1f3551d983;p=~emulex%2Finfiniband.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:
  icside: fix PCB version 6 support (v2)
  tx4939ide: typo fix and minor cleanup
  ide: add CS5536 host driver (v3)
  ide: Force VIA IDE legacy interrupts for AmigaOne boards
  IDE: Unregister and disable devices if initialization fails.
  ide: fix ide_register_port() failure handling
  ide: struct device - replace bus_id with dev_name(), dev_set_name()
  ide-cd: fix DMA for non bio-backed requests
---

017f51788ffdc16b0168143e38ea2c1f3551d983