David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-30 03:55:20 -04:00
..
9p	…
802	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
8021q	net: vlan: fix up vlan_proto_idx() for CONFIG_BUG=n	2013-04-21 15:58:19 -04:00
appletalk	appletalk: info leak in ->getname()	2013-04-25 01:47:58 -04:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-07 18:37:01 -04:00
ax25	ax25: fix info leak via msg_name in ax25_recvmsg()	2013-04-07 16:28:00 -04:00
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-04-29 15:31:57 -04:00
bridge	bridge: Add fdb dst check during fdb update	2013-04-29 11:40:26 -04:00
caif	caif: Remove bouncing address for Daniel Martensson	2013-04-23 13:25:51 -04:00
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2013-03-12 09:22:42 -07:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
dcb	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
dccp	tcp: Remove TCPCT	2013-03-17 14:35:13 -04:00
decnet	decnet: remove duplicated include from dn_table.c	2013-04-07 17:12:01 -04:00
dns_resolver	…
dsa	dsa: fix freeing of sparse port allocation	2013-03-25 12:23:41 -04:00
ethernet	net: add ETH_P_802_3_MIN	2013-03-28 01:20:42 -04:00
ieee802154	ieee802154/nl-mac.c: make some MLME operations optional	2013-04-08 12:00:16 -04:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
ipv6	net: Add MIB counters for checksum errors	2013-04-29 15:14:03 -04:00
ipx	…
irda	irda: irlmp_reasons[] can be static	2013-04-25 01:42:06 -04:00
iucv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
key	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2013-03-27 14:07:04 -04:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-07 18:37:01 -04:00
lapb	…
llc	llc: Fix missing msg_namelen update in llc_ui_recvmsg()	2013-04-07 16:28:01 -04:00
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-04-24 10:54:20 -04:00
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
netlabel	…
netlink	genetlink: fix possible memory leak in genl_family_rcv_msg()	2013-04-26 23:25:39 -04:00
netrom	netrom: info leak in ->getname()	2013-04-25 01:47:58 -04:00
nfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
openvswitch	openvswitch: Remove unneeded ovs_netdev_get_ifindex()	2013-04-30 00:19:11 -04:00
packet	sock_diag: allow to dump bpf filters	2013-04-29 13:21:30 -04:00
phonet	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
rds	…
rfkill	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-04-22 14:58:14 -04:00
rose	rose: fix info leak via msg_name in rose_recvmsg()	2013-04-07 16:28:02 -04:00
rxrpc	…
sched	netfilter: ipset: Introduce extensions to elements in the core	2013-04-29 20:08:54 +02:00
sctp	net: sctp: minor: remove dead code from sctp_packet	2013-04-22 16:25:21 -04:00
sunrpc	NFS client bugfixes for Linux 3.9	2013-04-10 09:00:51 -07:00
tipc	tipc: add InfiniBand media type	2013-04-17 14:18:33 -04:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
wimax	…
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-04-24 10:54:20 -04:00
x25	…
xfrm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2013-04-11 16:14:37 -04:00
Kconfig	netlink: mmaped netlink: ring setup	2013-04-19 14:57:57 -04:00
Makefile	…
compat.c	…
nonet.c	…
socket.c	net: socket: move ktime2ts to ktime header api	2013-04-19 16:39:13 -04:00
sysctl_net.c	…