From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Apr 2010 19:54:54 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: MMI-PSA29.97-13-9~24097
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cfc94b2c9ac603b20db54225408df6ed80188dcd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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: ohci: wait for local CSR lock access to finish
  firewire: ohci: prevent aliasing of locally handled register addresses
  firewire: core: fw_iso_resource_manage: return -EBUSY when out of resources
  firewire: core: fix retries calculation in iso manage_channel()
  firewire: cdev: fix cut+paste mistake in disclaimer
---

cfc94b2c9ac603b20db54225408df6ed80188dcd