commit cfc94b2c9ac603b20db54225408df6ed80188dcd
author Linus Torvalds <torvalds@linux-foundation.org> Thu Apr 22 12:54:54 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Apr 22 12:54:54 2010 -0700
tree 6e5b21adac556242b89931c4d0929b66efb8c0b9
parent 4c6a3999651741419cd3cc4303cf0c2be07d89bc
parent e1393667be574807a13bfaf1bb471f5fd1a5287b

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: 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