git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 265592a ba836a6)

author	David S. Miller <davem@davemloft.net>
	Wed, 11 Jan 2017 19:43:39 +0000 (14:43 -0500)
committer	David S. Miller <davem@davemloft.net>
	Wed, 11 Jan 2017 19:43:39 +0000 (14:43 -0500)
commit	02ac5d1487115d160fab4c3e61b7edc20a945af9
tree	08a39341379ce6f1ad4f3997df36c76ee82cee9c	tree \| snapshot
parent	265592a1dfc31ecab02a960721a1f137e50afb17	commit \| diff
parent	ba836a6f5ab1243ff5e08a941a2d1de8b31244e1	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Two AF_* families adding entries to the lockdep tables
at the same time.

Signed-off-by: David S. Miller <davem@davemloft.net>

19 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/realtek/rtlwifi/usb.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
net/Kconfig	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa2.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_semantics.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/sysctl_net_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository