| commit | 817b33d38f81c8736d39283c35c886ae4668f1af | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 30 17:36:45 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 30 17:36:45 2009 -0700 |
| tree | 64f60a88baf8b48c350d680f8b69fa6c759c3a82 | |
| parent | 84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4 [diff] | |
| parent | 8c185ab6185bf5e67766edb000ce428269364c86 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: ax25: Fix possible oops in ax25_make_new net: restore tx timestamping for accelerated vlans Phonet: fix mutex imbalance sit: fix off-by-one in ipip6_tunnel_get_prl net: Fix sock_wfree() race net: Make setsockopt() optlen be unsigned.