Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jul 2008 20:06:19 +0000 (13:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jul 2008 20:06:19 +0000 (13:06 -0700)
commitfbe0825752dc34b505777fd59cde4a6ce832eb16
tree7c6056676dc5d657e105761ae0dc19f98a700917
parentd28f87aa87ce8b196349d7c306a7e6fe3abd7155
parent2b54ed9467697b0ce2d60d89e5e4253c9e322c26
Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: ide_unregister() locking bugfix
  ide: ide_unregister() warm-plug bugfix
  ide: fix hwif->gendev refcounting