diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-29 08:19:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-29 08:19:02 -0700 |
| commit | 994b384a040d6f8afc3595c1a99c1b784e0cce49 (patch) | |
| tree | f7fb9b63f5a68a13bc6fbd160eba91b0c865b487 /usr | |
| parent | 29cfcddc0e745b515ec360ffe2ee4e7a4015efd8 (diff) | |
| parent | a4dc090b6cb445257d2a8e44f85395ced6d1ed3e (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:
firewire: ohci: work around VIA and NEC PHY packet reception bug
firewire: core: do not use del_timer_sync() in interrupt context
firewire: net: fix unicast reception RCODE in failure paths
firewire: sbp2: fix stall with "Unsolicited response"
firewire: sbp2: fix memory leak in sbp2_cancel_orbs or at send error
ieee1394: Adjust confusing if indentation
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions