diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-02 05:09:08 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-02 05:09:08 +0100 |
commit | 5983fe2b29df5885880d7fa3b91aca306c7564ef (patch) | |
tree | c9d968a776b7d1f8dc446d2857f6cefddec6edb0 /kernel/kmod.c | |
parent | Linux 3.2-rc4 (diff) | |
parent | netfilter: Remove ADVANCED dependency from NF_CONNTRACK_NETBIOS_NS (diff) | |
download | linux-5983fe2b29df5885880d7fa3b91aca306c7564ef.tar.xz linux-5983fe2b29df5885880d7fa3b91aca306c7564ef.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (73 commits)
netfilter: Remove ADVANCED dependency from NF_CONNTRACK_NETBIOS_NS
ipv4: flush route cache after change accept_local
sch_red: fix red_change
Revert "udp: remove redundant variable"
bridge: master device stuck in no-carrier state forever when in user-stp mode
ipv4: Perform peer validation on cached route lookup.
net/core: fix rollback handler in register_netdevice_notifier
sch_red: fix red_calc_qavg_from_idle_time
bonding: only use primary address for ARP
ipv4: fix lockdep splat in rt_cache_seq_show
sch_teql: fix lockdep splat
net: fec: Select the FEC driver by default for i.MX SoCs
isdn: avoid copying too long drvid
isdn: make sure strings are null terminated
netlabel: Fix build problems when IPv6 is not enabled
sctp: better integer overflow check in sctp_auth_create_key()
sctp: integer overflow in sctp_auth_create_key()
ipv6: Set mcast_hops to IPV6_DEFAULT_MCASTHOPS when -1 was given.
net: Fix corruption in /proc/*/net/dev_mcast
mac80211: fix race between the AGG SM and the Tx data path
...
Diffstat (limited to 'kernel/kmod.c')
0 files changed, 0 insertions, 0 deletions