Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Feb 2009 20:22:06 +0000 (12:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Feb 2009 20:22:06 +0000 (12:22 -0800)
commita36e4f0cab6311110d1703eafb325baead9caff8
tree09c0bda0639ea2ee36fb8f49563863dfad5dc32b
parent0b0a0806b0d8635e046bf533225a25903b1cddce
parent8fed43684174b68f04d01d1210fd00536af790df
Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: fix refcounting in device drivers
  ide-cd: document capacity hack
  it821x: remove dead URL
  atiixp: fix missing parentheses
  amd74xx: device/vendor confusion
  ide: ide.c 'clear' fix, update "ide=nodma" documentation