From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 16:43:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.32-rc1~169
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=ff830b8e5f999d1ccbd0282a666520f0b557daa4;p=cascardo%2Flinux.git

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:
  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.
---

ff830b8e5f999d1ccbd0282a666520f0b557daa4