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: iwlwifi: Allow building iwl3945 without iwl4965. wireless: Fix compile error with wifi & leds tcp: Fix slab corruption with ipv6 and tcp6fuzz ipv4/ipv6 compat: Fix SSM applications on 64bit kernels. [IPSEC]: Use digest_null directly for auth sunrpc: fix missing kernel-doc can: Fix copy_from_user() results interpretation Revert "ipv6: Fix typo in net/ipv6/Kconfig" tipc: endianness annotations ipv6: result of csum_fold() is already 16bit, no need to cast [XFRM] AUDIT: Fix flowlabel text format ambibuity.
Showing
- drivers/net/wireless/Makefile 1 addition, 1 deletiondrivers/net/wireless/Makefile
- drivers/net/wireless/iwlwifi/Kconfig 6 additions, 0 deletionsdrivers/net/wireless/iwlwifi/Kconfig
- include/net/compat.h 3 additions, 0 deletionsinclude/net/compat.h
- net/can/raw.c 10 additions, 11 deletionsnet/can/raw.c
- net/compat.c 117 additions, 0 deletionsnet/compat.c
- net/ipv4/ip_sockglue.c 5 additions, 0 deletionsnet/ipv4/ip_sockglue.c
- net/ipv4/tcp_input.c 1 addition, 2 deletionsnet/ipv4/tcp_input.c
- net/ipv6/Kconfig 1 addition, 1 deletionnet/ipv6/Kconfig
- net/ipv6/ip6mr.c 1 addition, 1 deletionnet/ipv6/ip6mr.c
- net/ipv6/ipv6_sockglue.c 5 additions, 0 deletionsnet/ipv6/ipv6_sockglue.c
- net/mac80211/Kconfig 3 additions, 1 deletionnet/mac80211/Kconfig
- net/sunrpc/xprt.c 1 addition, 1 deletionnet/sunrpc/xprt.c
- net/tipc/msg.h 3 additions, 4 deletionsnet/tipc/msg.h
- net/xfrm/xfrm_algo.c 1 addition, 2 deletionsnet/xfrm/xfrm_algo.c
- net/xfrm/xfrm_state.c 1 addition, 1 deletionnet/xfrm/xfrm_state.c
Loading
Please register or sign in to comment