Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 16:52:39 +0000 (09:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 16:52:39 +0000 (09:52 -0700)
commit326528a54f61e38fc16bf2e8ac028c6a33b615ed
tree6c10c99300f469c130564c0bcd5d0cf07eda1ade
parent3e5cce627cfaa35410ab77c50641c52b7096d3b5
parent2bfba3c444fe8b2ab1c38112a89d8f03b61136ca
Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: remove useless subdirs from drivers/ide/