From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Mar 2010 22:07:46 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.34-rc3~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50da56706b989b99edb20f9c03172df193240c78;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'for-linus' of git://git./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: align driver match with modalias
  firewire: core: fix Model_ID in modalias
  firewire: ohci: add cycle timer quirk for the TI TSB12LV22
  firewire: core: fw_iso_resource_manage: fix error handling
---

50da56706b989b99edb20f9c03172df193240c78