]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jan 2009 23:30:30 +0000 (15:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jan 2009 23:30:30 +0000 (15:30 -0800)
commitf0fb2eb7bd76b9927f1350cfb0a3653385b82c6c
treeb4a19bfc2a172548b9a021fa580c5b828c2ecb73
parent32b838b8cfa269d688889b3213e7ee37ee901f72
parent6230582320b721e6cf2581d048cb688dca97f504
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