android_kernel_motorola_sm6225/drivers/net/ibm_newemac
David S. Miller a1744d3bee Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/p54/p54common.c
2008-10-31 00:17:34 -07:00
..
core.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-10-31 00:17:34 -07:00
core.h ibm_newemac: Fix EMAC soft reset on 460EX/GT 2008-10-08 15:27:14 -07:00
debug.c ibm_newemac: Parameterize EMAC Multicast Match Handling 2008-07-09 16:30:46 +10:00
debug.h ibm_newemac: Update file headers copyright notices 2007-12-07 15:09:06 -05:00
emac.h ibm_newemac: Parameterize EMAC Multicast Match Handling 2008-07-09 16:30:46 +10:00
Kconfig Merge commit 'origin' 2008-10-15 11:31:54 +11:00
Makefile
mal.c ibm_newemac: Fix new MAL feature handling 2008-10-20 19:59:54 -04:00
mal.h Merge commit 'origin' 2008-10-15 11:31:54 +11:00
phy.c Merge commit 'origin' 2008-10-15 11:31:54 +11:00
phy.h ibm_newemac: Add support for GPCS, SGMII and M88E1112 PHY 2008-10-02 13:06:42 -04:00
rgmii.c ibm_newemac: Add MII mode support to the EMAC RGMII bridge. 2008-07-15 12:39:05 +10:00
rgmii.h ibm_newemac: Update file headers copyright notices 2007-12-07 15:09:06 -05:00
tah.c ibm_newemac: Fix section mismatch warnings 2008-04-25 02:08:06 -04:00
tah.h ibm_newemac: Update file headers copyright notices 2007-12-07 15:09:06 -05:00
zmii.c ibm_newemac: Fix section mismatch warnings 2008-04-25 02:08:06 -04:00
zmii.h ibm_newemac: Update file headers copyright notices 2007-12-07 15:09:06 -05:00