| commit | 62ad36a8a6541de82984e4f1a6cff09535d68098 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 30 14:24:32 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 30 14:24:32 2008 -0700 |
| tree | b395d88e2a0e6fe561b385fde097dff7cb3b92f6 | |
| parent | 8b9fc8ae6517086637dd227b7490ec027c867e48 [diff] | |
| parent | 729d4de96a5c090e40a918a41f63b7fb1b27c240 [diff] |
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"