From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jul 2008 02:22:54 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.26-rc9~73
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64;p=linux-2.6-omap-h63xx.git

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"
---

a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64