Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 17 Feb 2010 06:09:29 +0000 (22:09 -0800)]
1  2 
MAINTAINERS
arch/powerpc/kvm/Kconfig
drivers/net/benet/be_cmds.c
drivers/net/ixgbe/ixgbe_main.c
include/linux/pci.h
net/core/ethtool.c
net/ipv4/ipcomp.c
net/ipv6/ipcomp6.c
net/xfrm/xfrm_state.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge