git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 11c4315 7b8e54b)

author	David S. Miller <davem@davemloft.net>
	Sat, 26 Nov 2011 19:47:03 +0000 (14:47 -0500)
committer	David S. Miller <davem@davemloft.net>
	Sat, 26 Nov 2011 19:47:03 +0000 (14:47 -0500)
commit	cffa4ebd98deca235f262664acaea5b2cec5711b
tree	cd71e597bbbe677820bb229c6aedbad412758959	tree \| snapshot
parent	11c43157cf7b085051f6ff016b3c6a7714ffdea6	commit \| diff
parent	7b8e54ba1458b016aadc7b780402edb578f060a3	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/ipv4/inet_diag.c

12 files changed:

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/inet6_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_kapi.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.