Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Mar 2008 21:24:32 +0000 (14:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Mar 2008 21:24:32 +0000 (14:24 -0700)
* 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"


Trivial merge