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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/kvm/Kconfig
Simple merge

diff --cc drivers/net/benet/be_cmds.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc include/linux/pci.h
Simple merge

diff --cc net/core/ethtool.c
Simple merge

diff --cc net/ipv4/ipcomp.c
Simple merge

diff --cc net/ipv6/ipcomp6.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge