commit dcb4a1f0e0367efb813907e5083998bbb98b0456
author Linus Torvalds <torvalds@linux-foundation.org> Sat May 21 12:25:07 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat May 21 12:25:07 2011 -0700
tree 80b1edb72dd20ed20917e6c835bd49a0c0b52df2
parent c21fd1a8c68ce3f49b00caf10337169262cfb8ad
parent 105e53f863c04e1d9e5bb34bf753c9fdbce6a60c

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: sbp2: parallelize login, reconnect, logout
  firewire: sbp2: octlet AT payloads can be stack-allocated
  firewire: sbp2: omit Scsi_Host lock from queuecommand
  firewire: core: use non-reentrant workqueue with rescuer
  firewire: optimize iso queueing by setting wake only after the last packet
  firewire: octlet AT payloads can be stack-allocated
  firewire: ohci: optimize find_branch_descriptor()
  firewire: ohci: avoid separate DMA mapping for small AT payloads
  firewire: ohci: do not start DMA contexts before link is enabled