From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Mar 2008 21:24:32 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.25-rc8~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=62ad36a8a6541de82984e4f1a6cff09535d68098;p=~shefty%2Frdma-dev.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 defining SUPPORT_VLB_SYNC
  Revert "ide: change master/slave IDENTIFY order"
---

62ad36a8a6541de82984e4f1a6cff09535d68098