tree 4502487917ca7b677cac4e5496001a1abc981478
parent c1ab6cc68cb7d512ebba3496cd341286d2d7969d
parent 1d1dc5e83f3299c108a4e44d58cc4bfef48c876a
author Linus Torvalds <torvalds@linux-foundation.org> 1228932137 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228932137 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: fw-ohci: fix IOMMU resource exhaustion
  ieee1394: node manager causes up to ~3.25s delay in freezing tasks