David S. Miller 11fe883936 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>

2010-07-20 18:25:24 -07:00

..

Kconfig

ipsec: ipcomp - Merge IPComp implementations

2008-07-25 02:54:40 -07:00

Makefile

netns xfrm: per-netns sysctls

2008-11-25 18:00:48 -08:00

xfrm_algo.c

crypto: gcm - Add RFC4543 wrapper for GCM

2010-01-17 21:52:11 +11:00

xfrm_hash.c

[IPSEC]: kmalloc + memset conversion to kzalloc

2008-01-28 14:55:05 -08:00

xfrm_hash.h

net: Remove unnecessary semicolons after switch statements

2010-05-17 17:44:35 -07:00

xfrm_input.c

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

xfrm_ipcomp.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

xfrm_output.c

net: check for refcount if pop a stacked dst_entry

2010-06-04 15:56:00 -07:00

xfrm_policy.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-07-20 18:25:24 -07:00

xfrm_proc.c

xfrm: Introduce LINUX_MIB_XFRMFWDHDRERROR

2010-02-18 15:43:09 -08:00

xfrm_state.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-11 14:53:53 -07:00

xfrm_sysctl.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

xfrm_user.c

xfrm: add severity to printk

2010-05-17 23:23:13 -07:00