diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-30 23:24:32 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-30 23:24:32 +0200 |
commit | 62ad36a8a6541de82984e4f1a6cff09535d68098 (patch) | |
tree | b395d88e2a0e6fe561b385fde097dff7cb3b92f6 /drivers/char/generic_nvram.c | |
parent | dm9000 trivial annotation (diff) | |
parent | ide: fix defining SUPPORT_VLB_SYNC (diff) | |
download | linux-62ad36a8a6541de82984e4f1a6cff09535d68098.tar.xz linux-62ad36a8a6541de82984e4f1a6cff09535d68098.zip |
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"
Diffstat (limited to 'drivers/char/generic_nvram.c')
0 files changed, 0 insertions, 0 deletions