q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/net/phy
History
David S. Miller e486463e82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-25 15:50:32 -07:00
..
amd.c
bcm63xx.c
broadcom.c
cicada.c
davicom.c
dp83640.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
dp83640_reg.h
et1011c.c
fixed.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
icplus.c net: icplus: fix interrupt mask 2012-06-04 12:02:40 -04:00
Kconfig netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines. 2012-05-07 22:58:09 -04:00
lxt.c
Makefile netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines. 2012-05-07 22:58:09 -04:00
marvell.c
mdio-bitbang.c
mdio-gpio.c
mdio-mux-gpio.c netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines. 2012-05-07 22:58:09 -04:00
mdio-mux.c netdev/of/phy: Add MDIO bus multiplexer support. 2012-05-07 22:58:09 -04:00
mdio-octeon.c
mdio_bus.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07:00
micrel.c phy/micrel: change phy_id_mask for KSZ9021 and KS8001 2012-06-19 00:31:36 -07:00
national.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
phy.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
phy_device.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
qsemi.c
realtek.c
smsc.c
spi_ks8995.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
ste10Xp.c
vitesse.c