Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commita5db219f4cf9f67995eabd53b81a1232c82f5852
authorDavid S. Miller <davem@davemloft.net>
Wed, 19 Jan 2011 00:28:31 +0000 (18 16:28 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jan 2011 00:28:31 +0000 (18 16:28 -0800)
tree5fffcb7ebd543b39468822963f9190fe6bf41bff
parentc56eb8fb6dccb83d9fe62fd4dc00c834de9bc470
parentff76015f3bdfbc482c723cb4f2559cef84d178ca
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
drivers/net/bnx2x/bnx2x.h
drivers/net/bnx2x/bnx2x_reg.h
drivers/net/gianfar.c
net/core/dev.c