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 573201f36f 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	…
Makefile	…
xfrm_algo.c	…
xfrm_hash.c	…
xfrm_hash.h	…
xfrm_input.c	…
xfrm_ipcomp.c	…
xfrm_output.c	…
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_state.c	…
xfrm_sysctl.c	…
xfrm_user.c	…