author | Linus Torvalds <torvalds@linux-foundation.org> | |
Wed, 23 Sep 2009 16:43:22 +0000 (09:43 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Wed, 23 Sep 2009 16:43:22 +0000 (09:43 -0700) | ||
commit | ff830b8e5f999d1ccbd0282a666520f0b557daa4 | |
tree | 5979aba5ed48c93d658a208f3a1f714e9e1e8b67 | tree | snapshot (tar.xz tar.gz zip) |
parent | 746942d06acdb4dd78d16baa5f3728a48a033bdd | commit | diff |
parent | 625f0850a8e27b6a8d6fdb95056f35bc22d92b55 | commit | diff |
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.
* '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.