Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)]
1  2 
drivers/net/bnx2x/bnx2x.h
drivers/net/bnx2x/bnx2x_reg.h
drivers/net/gianfar.c
net/core/dev.c

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