]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff3df54 b7a7179)
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)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: nodemgr: fix startup of knodemgrd


Trivial merge
Linux 2.6 source tree