Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 Apr 2011 21:05:23 +0000 (14:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Apr 2011 21:05:23 +0000 (14:05 -0700)
commitc1e48efc701b79ee4367c9a1a4e8bbc7c3586e02
tree91921f7c0884813c72993fcd2ecd37dc5e56d89d
parent912d398d28b4359c2fb1f3763f1ce4f86de8350e
parent1b86a58f9d7ce4fe2377687f378fbfb53bdc9b6c
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/benet/be_main.c
drivers/net/benet/be.h
drivers/net/benet/be_main.c
drivers/net/smsc911x.c
include/net/route.h