Linus Torvalds 7c17d86a85 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (69 commits) pptp: Accept packet with seq zero RDS: Remove some unused iWARP code net: fsl: fec: handle 10Mbps speed in RMII mode drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: add missing iounmap drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap ksz884x: fix mtu for VLAN net_sched: sfq: add optional RED on top of SFQ dp83640: Fix NOHZ local_softirq_pending 08 warning gianfar: Fix invalid TX frames returned on error queue when time stamping gianfar: Fix missing sock reference when processing TX time stamps phylib: introduce mdiobus_alloc_size() net: decrement memcg jump label when limit, not usage, is changed net: reintroduce missing rcu_assign_pointer() calls inet_diag: Rename inet_diag_req_compat into inet_diag_req inet_diag: Rename inet_diag_req into inet_diag_req_v2 bond_alb: don't disable softirq under bond_alb_xmit mac80211: fix rx->key NULL pointer dereference in promiscuous mode nl80211: fix old station flags compatibility mdio-octeon: use an unique MDIO bus name. mdio-gpio: use an unique MDIO bus name. ...		2012-01-12 20:30:02 -08:00
..
9p	virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf	2012-01-12 15:44:42 +10:30
802
8021q	vlan: static functions	2011-12-14 02:39:30 -05:00
appletalk
atm
ax25	ax25: avoid overflows in ax25_setsockopt()	2011-12-28 14:08:08 -05:00
batman-adv	batman-adv: Fix merge error.	2011-12-16 15:07:28 -05:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2012-01-10 15:44:17 -05:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
caif	Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2012-01-09 13:08:28 -08:00
can
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2011-12-13 14:59:42 -08:00
core	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
dcb
dccp	inet_diag: Rename inet_diag_req into inet_diag_req_v2	2012-01-11 12:56:06 -08:00
decnet	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
dns_resolver
dsa
econet
ethernet
ieee802154
ipv4	net: decrement memcg jump label when limit, not usage, is changed	2012-01-12 12:27:59 -08:00
ipv6	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
ipx
irda	irda: use msecs_to_jiffies() rather than manual calculation	2011-12-21 15:46:22 -05:00
iucv	af_iucv: get rid of state IUCV_SEVERED	2011-12-20 14:05:03 -05:00
key	net: use IS_ENABLED(CONFIG_IPV6)	2011-12-11 18:25:16 -05:00
l2tp
lapb
llc	llc: llc_cmsg_rcv was getting called after sk_eat_skb.	2011-12-19 15:58:52 -05:00
mac80211	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
netfilter	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
netlabel	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
netlink	genetlink: add auto module loading	2011-12-28 13:48:55 -05:00
netrom	netrom: avoid overflows in nr_setsockopt()	2011-12-28 14:08:08 -05:00
nfc	NFC: Export a new attribute nfcid1 in target info	2012-01-04 14:30:43 -05:00
openvswitch
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-30 13:04:14 -05:00
phonet	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
rds	RDS: Remove some unused iWARP code	2012-01-12 20:05:28 -08:00
rfkill	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-05 10:13:24 -05:00
rose
rxrpc	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
sched	net_sched: sfq: add optional RED on top of SFQ	2012-01-12 20:05:28 -08:00
sctp	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-12 20:30:02 -08:00
tipc	tipc: rename struct bearer_name to struct tipc_bearer_names	2011-12-29 21:53:30 -05:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-09 14:46:52 -08:00
wanrouter
wimax
wireless	nl80211: fix old station flags compatibility	2012-01-11 15:14:50 -05:00
x25	net:x25: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xfrm	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
compat.c
Kconfig
Makefile
nonet.c
socket.c	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
sysctl_net.c