tree b4a19bfc2a172548b9a021fa580c5b828c2ecb73
parent 32b838b8cfa269d688889b3213e7ee37ee901f72
parent 6230582320b721e6cf2581d048cb688dca97f504
author Linus Torvalds <torvalds@linux-foundation.org> 1231543830 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231543830 -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: core: fix sleep in atomic context due to driver core change