diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-21 07:58:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-21 07:58:16 +0200 |
| commit | 0f851021c0f91e5073fa89f26b5ac68e23df8e11 (patch) | |
| tree | 23c3e56c76361386c56ddf4ffcecad17bd8c004d /drivers/sbus | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | ide/Kconfig: add missing range check for IDE_MAX_HWIFS (diff) | |
| download | linux-0f851021c0f91e5073fa89f26b5ac68e23df8e11.tar.xz linux-0f851021c0f91e5073fa89f26b5ac68e23df8e11.zip | |
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/sbus')
0 files changed, 0 insertions, 0 deletions