tree b63a9898c9a2b6563d8aec75c2abbec379898613
parent 211c8d4942edf2f3337820dda101da6b13c8a19a
parent f05e21b39f7dddcebab03ff329fef5783fea58d4
author Linus Torvalds <torvalds@linux-foundation.org> 1217179446 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217179446 -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: state userland requirements in Kconfig help
  firewire: avoid memleak after phy config transmit failure
  firewire: fw-ohci: TSB43AB22/A dualbuffer workaround
  firewire: queue the right number of data
  firewire: warn on unfinished transactions during card removal
  firewire: small fw_fill_request cleanup
  firewire: fully initialize fw_transaction before marking it pending
  firewire: fix race of bus reset with request transmission