Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 17:24:06 +0000 (10:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 17:24:06 +0000 (10:24 -0700)
commit837b41b5de356aa67abb2cadb5eef3efc7776f91
treeb63a9898c9a2b6563d8aec75c2abbec379898613
parent211c8d4942edf2f3337820dda101da6b13c8a19a
parentf05e21b39f7dddcebab03ff329fef5783fea58d4
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: 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
drivers/firewire/fw-ohci.c
include/linux/pci_ids.h