git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d6f03f2 fc0b927)

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	6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c
tree	cd71e597bbbe677820bb229c6aedbad412758959	tree \| snapshot
parent	d6f03f29f7cdf064289f941bf0b838348e996e65	commit \| diff
parent	fc0b927d9a5024e138c4318fe19a590f23e3eeec	commit \| diff

Merge git://git./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

Unnamed repository; edit this file 'description' to name the repository.