1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-24 17:23:25 -05:00
linux/net
Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-11-07 10:32:44 +01:00
..
6lowpan
9p
802
8021q
appletalk
atm
ax25
batman-adv
bluetooth
bpf
bridge
caif
can
ceph
core Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
dcb
dccp
decnet
dns_resolver
dsa
ethernet
hsr
ieee802154
ife
ipv4 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
ipv6 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
ipx
iucv
kcm
key
l2tp
l3mdev
lapb
llc Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
mac80211 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
mac802154
mpls
ncsi
netfilter Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
netlabel Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
netlink
netrom
nfc
nsh
openvswitch
packet
phonet
psample
qrtr
rds
rfkill
rose
rxrpc
sched Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-03 09:09:21 -07:00
sctp
smc
strparser
sunrpc
switchdev
tipc
tls
unix
vmw_vsock
wimax
wireless Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
x25
xfrm
compat.c
Kconfig
Makefile
socket.c
sysctl_net.c