Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 26 Jan 2011 21:49:30 +0000 (13:49 -0800)]
1  2 
drivers/net/bnx2.c
net/core/ethtool.c
net/core/skbuff.c

Simple merge
Simple merge
Simple merge