Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/drivers/net/phy
History
David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-12 21:59:18 -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.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
dp83640_reg.h ptp: Added a clock driver for the National Semiconductor PHYTER. 2011-05-23 13:10:23 -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-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
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: add ability to support 50MHz RMII clock on KZS8051RNL 2011-02-14 17:38:30 -08: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 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