Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 23 Mar 2007 18:02:45 +0000 (11:02 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 23 Mar 2007 18:02:45 +0000 (11:02 -0700)
commitcad6a84a3913bc2d8a7ebb183e385dd6a2b76438
tree88caf0cfccdbac8b6d4a7840c57e56f06d7c5bb3
parent0ab602e5bc13e0ec6d41c0c325f005354d55b953
parent7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8
Merge branch 'for-linus' of git://git./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