Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 8 Oct 2006 19:28:41 +0000 (12:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 8 Oct 2006 19:28:41 +0000 (12:28 -0700)
commit7ff3e52cf2947ebd38c84159af68e5a29d228f6c
tree17f1a54b368554b722c18c28852ded0f90856865
parentff3df54efacff4ecdcab32826e45798453eecf90
parentb7a7179dcae6cecfaaa8384f8c088fb7823c6c90
Merge branch 'upstream-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: nodemgr: fix startup of knodemgrd