From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2008 18:02:17 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.28-rc8~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cdcb30b5cca157ff73892900ac309d5ee4151c04;p=linux-2.6-omap-h63xx.git

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
---

cdcb30b5cca157ff73892900ac309d5ee4151c04