diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 11:02:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 11:02:45 -0700 |
commit | cad6a84a3913bc2d8a7ebb183e385dd6a2b76438 (patch) | |
tree | 88caf0cfccdbac8b6d4a7840c57e56f06d7c5bb3 /arch/x86_64 | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff) | |
parent | ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion (diff) | |
download | linux-dev-cad6a84a3913bc2d8a7ebb183e385dd6a2b76438.tar.xz linux-dev-cad6a84a3913bc2d8a7ebb183e385dd6a2b76438.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion
Diffstat (limited to 'arch/x86_64')
0 files changed, 0 insertions, 0 deletions