diff options
| author | Linus Torvalds <[email protected]> | 2010-08-29 15:19:02 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-08-29 15:19:02 +0000 |
| commit | 994b384a040d6f8afc3595c1a99c1b784e0cce49 (patch) | |
| tree | f7fb9b63f5a68a13bc6fbd160eba91b0c865b487 /net/unix/af_unix.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | firewire: ohci: work around VIA and NEC PHY packet reception bug (diff) | |
| download | kernel-994b384a040d6f8afc3595c1a99c1b784e0cce49.tar.gz kernel-994b384a040d6f8afc3595c1a99c1b784e0cce49.zip | |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions