Searched hist:b26e478f (Results 1 – 6 of 6) sorted by relevance
/openbmc/linux/drivers/net/ethernet/freescale/ |
H A D | fsl_pq_mdio.c | 464b57da Tue Mar 27 17:05:54 CDT 2012 Kenth Eriksson <kenth.eriksson@transmode.com> Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
The merge done in commit b26e478f undid bug fix in commit c3e072f8 ("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non TBI (e.g. MDIO) PHYs cannot be accessed.
Signed-off-by: Kenth Eriksson <kenth.eriksson@transmode.com> Signed-off-by: David S. Miller <davem@davemloft.net> 464b57da Tue Mar 27 17:05:54 CDT 2012 Kenth Eriksson <kenth.eriksson@transmode.com> Fix non TBI PHY access; a bad merge undid bug fix in a previous commit. The merge done in commit b26e478f undid bug fix in commit c3e072f8 ("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non TBI (e.g. MDIO) PHYs cannot be accessed. Signed-off-by: Kenth Eriksson <kenth.eriksson@transmode.com> Signed-off-by: David S. Miller <davem@davemloft.net> b26e478f Fri Dec 16 01:11:14 CST 2011 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c
|
/openbmc/linux/drivers/net/ppp/ |
H A D | pptp.c | b26e478f Fri Dec 16 01:11:14 CST 2011 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c
|
/openbmc/linux/net/sched/ |
H A D | sch_gred.c | b26e478f Fri Dec 16 01:11:14 CST 2011 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c
|
/openbmc/linux/net/ipv4/ |
H A D | ipip.c | b26e478f Fri Dec 16 01:11:14 CST 2011 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c
|
/openbmc/linux/net/batman-adv/ |
H A D | translation-table.c | b26e478f Fri Dec 16 01:11:14 CST 2011 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c
|
/openbmc/linux/net/ipv6/ |
H A D | sit.c | b26e478f Fri Dec 16 01:11:14 CST 2011 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c
|