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)
commit62ad36a8a6541de82984e4f1a6cff09535d68098
treeb395d88e2a0e6fe561b385fde097dff7cb3b92f6
parent8b9fc8ae6517086637dd227b7490ec027c867e48
parent729d4de96a5c090e40a918a41f63b7fb1b27c240
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 defining SUPPORT_VLB_SYNC
  Revert "ide: change master/slave IDENTIFY order"