From: Linus Torvalds Date: Sun, 8 Oct 2006 19:28:41 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13... X-Git-Tag: v2.6.19-rc2~263 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7ff3e52cf2947ebd38c84159af68e5a29d228f6c;p=linux-2.6-omap-h63xx.git 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 --- 7ff3e52cf2947ebd38c84159af68e5a29d228f6c