tree 870f95ae22f423e60f4518fd38ab8e0649769991
parent 15895b932b8a047a1db7006a4f9ca74485d5a826
parent 4283e1babe167e0ba856bb5d039465358e90785c
author Linus Torvalds <torvalds@linux-foundation.org> 1215051774 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215051774 -0700

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:
  ide: fix /proc/ide/ide?/mate reporting
  Revert "BAST: Remove old IDE driver"