Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 02:22:54 +0000 (19:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 02:22:54 +0000 (19:22 -0700)
commita16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64
tree870f95ae22f423e60f4518fd38ab8e0649769991
parent15895b932b8a047a1db7006a4f9ca74485d5a826
parent4283e1babe167e0ba856bb5d039465358e90785c
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 /proc/ide/ide?/mate reporting
  Revert "BAST: Remove old IDE driver"