diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-20 22:58:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-20 22:58:16 -0700 |
| commit | 0f851021c0f91e5073fa89f26b5ac68e23df8e11 (patch) | |
| tree | 23c3e56c76361386c56ddf4ffcecad17bd8c004d /drivers/net/znet.c | |
| parent | ea8df8c5e609a53f4d03d133baea9561412f4303 (diff) | |
| parent | 8929fea39cb0ab3e455fe00e7eb6806c32155cd2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide/Kconfig: add missing range check for IDE_MAX_HWIFS
hpt366: fix kernel oops with HPT302N
ide/pci/delkin_cb.c: add new PCI ID
Diffstat (limited to 'drivers/net/znet.c')
0 files changed, 0 insertions, 0 deletions