tree 413be4ee2a75bb523d6e829ef0e52057f408222e
parent 5c56f466835d20fc4f7119063a8c029f7170a317
parent a65421ea3f8a0e78b4e3b858bdc5ada5ad653807
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171919239 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171919239 -0800

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