tree 17f1a54b368554b722c18c28852ded0f90856865
parent ff3df54efacff4ecdcab32826e45798453eecf90
parent b7a7179dcae6cecfaaa8384f8c088fb7823c6c90
author Linus Torvalds <torvalds@g5.osdl.org> 1160335721 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1160335721 -0700

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/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