From: Linus Torvalds Date: Mon, 19 Feb 2007 21:07:19 +0000 (-0800) Subject: Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394... X-Git-Tag: v2.6.21-rc1~76 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=920841d8d1d61bc12b43f95a579a5374f6d98f81;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: fix another deadlock in nodemgr ieee1394: cycle timer read extension for raw1394 --- 920841d8d1d61bc12b43f95a579a5374f6d98f81