Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 17 Feb 2010 06:09:29 +0000 (22:09 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Feb 2010 06:09:29 +0000 (22:09 -0800)
commit2bb4646fce8d09916b351d1a62f98db7cec6fc41
treec1f0d002e69868606eca9d1b919835f422892063
parent6836b9bdd98e3b500cd49512484df68f46e14659
parentb0483e78e5c4c9871fc5541875b3bc006846d46b
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
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