From: Linus Torvalds Date: Mon, 26 Mar 2007 21:51:24 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: firefly_0821_release~30524 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=703071b5b93d88d5acb0edd5b9dd86c69ad970f2;p=firefly-linux-kernel-4.4.55.git Merge /pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [SUNGEM]: Fix MAC address setting when interface is up. [IPV4] fib_trie: Document locking. [NET]: Correct accept(2) recovery after sock_attach_fd() [PPP]: Don't leak an sk_buff on interface destruction. [NET_SCHED]: Fix ingress locking [NET_SCHED]: cls_basic: fix NULL pointer dereference [DCCP]: make dccp_write_xmit_timer() static again [TG3]: Update version and reldate. [TG3]: Exit irq handler during chip reset. [TG3]: Eliminate the unused TG3_FLAG_SPLIT_MODE flag. [IPV6]: Fix routing round-robin locking. [DECNet] fib: Fix out of bound access of dn_fib_props[] [IPv4] fib: Fix out of bound access of fib_props[] [NET] AX.25 Kconfig and docs updates and fixes [NET]: Fix neighbour destructor handling. [NET]: Fix fib_rules compatibility breakage [SCTP]: Update SCTP Maintainers entry [NET]: remove unused header file: drivers/net/wan/lmc/lmc_media.h --- 703071b5b93d88d5acb0edd5b9dd86c69ad970f2