Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Sat, 20 Mar 2010 22:24:29 +0000 (15:24 -0700)]
1  2 
drivers/net/ks8851.c
include/linux/netdevice.h
net/core/dev.c

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