Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 20 Mar 2010 22:24:29 +0000 (15:24 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 20 Mar 2010 22:24:29 +0000 (15:24 -0700)
commite77c8e83dd587f2616d7ff20d23a897891e6e20d
treeba5d2ce6541119f329b2fd51181aaae8528b38f0
parent641cb85e68945878d520d5fc3c2dc64aa1dda868
parentaf98441397227a5a4f212cd48710eea72a14dbdb
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
drivers/net/ks8851.c
include/linux/netdevice.h
net/core/dev.c