Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 19 Feb 2007 21:07:19 +0000 (13:07 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 19 Feb 2007 21:07:19 +0000 (13:07 -0800)
commit920841d8d1d61bc12b43f95a579a5374f6d98f81
tree413be4ee2a75bb523d6e829ef0e52057f408222e
parent5c56f466835d20fc4f7119063a8c029f7170a317
parenta65421ea3f8a0e78b4e3b858bdc5ada5ad653807
Merge branch 'for-linus' of ssh:///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
drivers/ieee1394/raw1394.c