From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Jan 2009 23:30:30 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.29-rc1~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f0fb2eb7bd76b9927f1350cfb0a3653385b82c6c;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: core: fix sleep in atomic context due to driver core change
---

f0fb2eb7bd76b9927f1350cfb0a3653385b82c6c