David S. Miller 2bd93d7af1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-04-26 12:16:46 -07:00

..

fec.h

…

fs_enet-main.c

net: Remove invalid offloads

2011-04-10 18:55:17 -07:00

fs_enet.h

fs_enet: Add support for MPC512x to fs_enet driver

2010-02-27 02:34:35 -08:00

Kconfig

fs_enet: Add support for MPC512x to fs_enet driver

2010-02-27 02:34:35 -08:00

mac-fcc.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

mac-fec.c

powerpc: Fix multicast problem in fs_enet driver

2011-04-21 16:59:30 -07:00

mac-scc.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

Makefile

…

mii-bitbang.c

dt/net: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:44 -07:00

mii-fec.c

dt/net: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:44 -07:00