tree 5979aba5ed48c93d658a208f3a1f714e9e1e8b67
parent 746942d06acdb4dd78d16baa5f3728a48a033bdd
parent 625f0850a8e27b6a8d6fdb95056f35bc22d92b55
author Linus Torvalds <torvalds@linux-foundation.org> 1253724202 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253724202 -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:
  ieee1394: sbp2: remove a workaround for Momobay FX-3A
  firewire: sbp2: remove a workaround for Momobay FX-3A
  firewire: sbp2: fix status reception
  firewire: core: fix topology map response handler
  firewire: core: fix race with parallel PCI device probe
  firewire: core: header file cleanup
  firewire: ohci: fix Self ID Count register mask (safeguard against buffer overflow)
  ieee1394: raw1394: Do not leak memory on failed trylock.