Linus Torvalds 2aa72f6121 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (35 commits) NET: SB1250: Initialize .owner vxge: show startup message with KERN_INFO ll_temac: Fix missing iounmaps bridge: Clear IPCB before possible entry into IP stack bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined net/ne: fix memory leak in ne_drv_probe() xfrm: fix xfrm by MARK logic virtio_net: fix oom handling on tx virtio_net: do not reschedule rx refill forever s2io: resolve statistics issues linux/net.h: fix kernel-doc warnings net: decreasing real_num_tx_queues needs to flush qdisc sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock qlge: fix a eeh handler to not add a pending timer qlge: Replacing add_timer() to mod_timer() usbnet: Set parent device early for netdev_printk() net: Revert "rndis_host: Poll status channel before control channel" netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h ...		2010-07-07 19:56:00 -07:00
..
9p	kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN	2010-05-25 08:07:02 -07:00
802	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
8021q	net: deliver skbs on inactive slaves to exact matches	2010-06-10 22:23:34 -07:00
appletalk	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
atm	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
ax25	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
bluetooth	Bluetooth: Bring back var 'i' increment	2010-06-24 22:08:37 -07:00
bridge	bridge: Clear IPCB before possible entry into IP stack	2010-07-07 14:43:33 -07:00
caif	caif: fix a couple range checks	2010-06-09 16:18:53 -07:00
can	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
core	net: decreasing real_num_tx_queues needs to flush qdisc	2010-07-02 21:59:07 -07:00
dcb	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dccp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-25 16:59:51 -07:00
decnet	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
dsa	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
econet	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ethernet	net: Inline skb_pull() in eth_type_trans().	2010-05-02 02:21:44 -07:00
ieee802154	ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc	2010-05-23 23:11:07 -07:00
ipv4	xfrm: fix xfrm by MARK logic	2010-07-04 11:46:07 -07:00
ipv6	xfrm: fix xfrm by MARK logic	2010-07-04 11:46:07 -07:00
ipx	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
irda	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
iucv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-28 10:18:40 -07:00
key	pfkey: add severity to printk	2010-05-17 23:23:13 -07:00
l2tp	l2tp_eth: fix memory allocation	2010-04-23 16:37:33 -07:00
lapb	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
llc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2010-06-16 13:41:55 -07:00
netfilter	ipvs: Add missing locking during connection table hashing and unhashing	2010-06-09 16:10:57 +02:00
netlabel	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
netlink	netlink: Implment netlink_broadcast_filtered	2010-05-21 09:37:32 -07:00
netrom	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
packet	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-21 01:14:25 -07:00
phonet	Phonet: listening socket lock protects the connected socket list	2010-05-29 00:18:50 -07:00
rds	net/rds: Add missing mutex_unlock	2010-05-29 00:18:48 -07:00
rfkill	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
rose	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
rxrpc	net: sock_def_readable() and friends RCU conversion	2010-05-01 15:00:15 -07:00
sched	Clear IFF_XMIT_DST_RELEASE for teql interfaces	2010-06-16 14:47:30 -07:00
sctp	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
sunrpc	SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir()	2010-06-22 13:21:18 -04:00
tipc	tipc: Reduce footprint by un-inlining tipc_msg_* routines	2010-05-12 23:02:29 -07:00
unix	unix/garbage: kill copy of the skb queue walker	2010-05-03 15:39:58 -07:00
wanrouter	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
wimax	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
wireless	cfg80211: add missing braces	2010-05-21 14:40:01 -04:00
x25	X25: Remove bkl in sockopts	2010-05-17 17:39:28 -07:00
xfrm	xfrm: check bundle policy existance before dereferencing it	2010-06-24 14:35:00 -07:00
compat.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	net/sysfs: Fix the bitrot in network device kobject namespace support	2010-05-21 09:37:32 -07:00
Makefile	l2tp: Split pppol2tp patch into separate l2tp and ppp parts	2010-04-03 14:56:02 -07:00
nonet.c
socket.c	cls_cgroup: Store classid in struct sock	2010-05-24 00:12:34 -07:00
sysctl_net.c	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
TUNABLE