Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 7 Oct 2009 05:43:16 +0000 (22:43 -0700)]
1  2 
drivers/net/benet/be_ethtool.c
net/core/net-sysfs.c
net/core/pktgen.c

Simple merge
Simple merge
Simple merge