korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 00:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
90de9bab91
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 phy: add am79c874 PHY support 2012-03-19 18:02:05 -04:00
bcm63xx.c net:phy:bcm63xx: remove unnecessary code 2012-04-03 19:02:00 -04:00
broadcom.c drivers/net: Remove boolean comparisons to true/false 2012-02-13 00:47:40 -05:00
cicada.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
davicom.c net:phy:davicom: remove unnecessary code 2012-04-03 19:02:00 -04:00
dp83640_reg.h ptp: Added a clock driver for the National Semiconductor PHYTER. 2011-05-23 13:10:23 -07:00
dp83640.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
et1011c.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
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 net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
Makefile netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines. 2012-05-07 22:58:09 -04:00
marvell.c net:phy:marvell: remove unnecessary code 2012-04-03 19:02:00 -04:00
mdio_bus.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07:00
mdio-bitbang.c mdio-gpio: Add reset functionality to mdio-gpio driver(v2). 2011-11-15 16:56:17 -05:00
mdio-gpio.c irq_domain/x86: Convert x86 (embedded) to use common irq_domain 2012-02-23 14:37:47 -07:00
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-octeon: use an unique MDIO bus name. 2012-01-10 16:35:02 -08: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_device.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
qsemi.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
realtek.c drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
smsc.c net: phy: smsc: Move SMSC PHY constants to <linux/smscphy.h> 2012-01-03 20:23:18 -05:00
spi_ks8995.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
ste10Xp.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
vitesse.c phylib: Modify Vitesse RGMII skew settings 2011-10-19 15:59:45 -04:00