tree abd2154d0515bf5581cdd2d2a6224960829145d2
parent 31390d0fde1ac9cf47002729660ffd7cd2ae1d75
parent cd1f70fdb4823c97328a1f151f328eb36fafd579
author Linus Torvalds <torvalds@linux-foundation.org> 1225125436 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225125436 -0700

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: fw-sbp2: fix races
  firewire: fw-sbp2: delay first login to avoid retries
  firewire: fw-ohci: initialization failure path fixes
  firewire: fw-ohci: don't leak dma memory on module removal
  firewire: fix struct fw_node memory leak
  firewire: Survive more than 256 bus resets