David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
6lowpan	net/6lowpan: Remove FSF address from GPL statement.	2014-12-05 12:43:04 +01:00
9p	9p/trans_virtio: enable VQs early	2014-10-15 10:25:04 +10:30
802
8021q	vlan: advertise link netns via netlink	2015-01-23 17:51:15 -08:00
appletalk	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
atm	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
ax25	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
batman-adv	batman-adv: Kconfig, Add missing DEBUG_FS dependency	2015-01-07 22:17:11 +01:00
bluetooth	Bluetooth: Remove unused function	2015-01-16 13:06:38 +02:00
bridge	bridge: simplify br_getlink() a bit	2015-01-25 23:32:49 -08:00
caif	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
can	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
ceph	libceph: fix sparse endianness warnings	2015-01-08 20:36:57 +03:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
dcb	dcbnl : Disable software interrupts before taking dcb_lock	2014-11-16 14:50:52 -05:00
dccp	net: introduce helper macro for_each_cmsghdr	2014-12-10 22:41:55 -05:00
decnet	netlink: Fix bugs in nlmsg_end() conversions.	2015-01-18 23:36:08 -05:00
dns_resolver
dsa	net: dsa: set slave MII bus PHY mask	2015-01-25 16:00:54 -08:00
ethernet	net: Add Transparent Ethernet Bridging GRO support.	2015-01-02 15:46:41 -05:00
hsr
ieee802154	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
ipx	switch ipxrtr_route_packet() from iovec to msghdr	2014-11-24 04:28:49 -05:00
irda	irda: Convert function pointer arrays and uses to const	2014-12-10 15:33:16 -05:00
iucv	net: introduce helper macro for_each_cmsghdr	2014-12-10 22:41:55 -05:00
key	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
l2tp	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
lapb	lapb: move EXPORT_SYMBOL after functions.	2014-10-24 15:51:42 -04:00
llc	net: llc: use correct size for sysctl timeout entries	2015-01-25 00:23:21 -08:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
mac802154	mac802154: fix kbuild test robot warning	2015-01-03 01:51:51 +01:00
mpls	mpls: Fix allowed protocols for mpls gso	2014-12-23 23:57:31 -05:00
netfilter	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
netlabel	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
netrom	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
nfc	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
openvswitch	openvswitch: Add support for unique flow IDs.	2015-01-26 15:45:50 -08:00
packet	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
phonet	phonet netlink: allow multiple messages per skb in route dump	2015-01-19 16:20:17 -05:00
rds	rds: Fix min() warning in rds_message_inc_copy_to_user()	2014-12-15 11:49:09 -05:00
rfkill	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
rose	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
rxrpc	net: introduce helper macro for_each_cmsghdr	2014-12-10 22:41:55 -05:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
sctp	net: sctp: fix slab corruption from use after free on INIT collisions	2015-01-26 17:02:05 -08:00
sunrpc	rpc: fix xdr_truncate_encode to handle buffer ending on page boundary	2015-01-07 14:03:58 -05:00
switchdev	switchdev: introduce switchdev notifier	2015-01-18 00:23:57 -05:00
tipc	tipc: fix excessive network event logging	2015-01-26 16:58:08 -08:00
unix	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
vmw_vsock	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
x25	new helper: memcpy_from_msg()	2014-11-24 04:28:48 -05:00
xfrm	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
compat.c	put iov_iter into msghdr	2014-12-09 16:29:03 -05:00
Kconfig	net: introduce generic switch devices support	2014-12-02 20:01:20 -08:00
Makefile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-12-16 15:53:03 -08:00
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
sysctl_net.c