p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
133,336 Commits 2 Branches 0 Tags 3.6 GiB
Commit Graph

2 Commits

Author SHA1 Message Date
David S. Miller 508827ff0a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
 2009-03-05 02:06:47 -08:00
Andy Fleming 1577ecef76 netdev: Merge UCC and gianfar MDIO bus drivers 
The MDIO bus drivers for the UCC and gianfar ethernet controllers are
essentially the same.  There's no reason to duplicate that much code.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2009-02-04 16:42:35 -08:00