q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/net/phy
History
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-28 14:40:49 -04:00
..
amd.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
bcm63xx.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
bcm87xx.c net/phy/bcm87xx: Add MODULE_LICENSE("GPL") to GPL driver 2012-09-22 15:33:46 -04:00
broadcom.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
cicada.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
davicom.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
dp83640.c ptp: link the phc device to its parent device 2012-09-22 15:42:38 -04: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 phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
Kconfig netdev/phy: add MDIO bus multiplexer driven by a memory-mapped device 2012-08-30 12:54:48 -04:00
lxt.c lxt PHY: Support for the buggy LXT973 rev A2 2012-09-27 17:58:06 -04:00
Makefile netdev/phy: add MDIO bus multiplexer driven by a memory-mapped device 2012-08-30 12:54:48 -04:00
marvell.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -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 of/mdio-gpio: Simplify the way device tree support is implemented. 2012-08-30 12:37:52 -04:00
mdio-mux-gpio.c drivers/net/phy/mdio-mux-gpio.c: drop devm_kfree of devm_kzalloc'd data 2012-08-06 13:24:27 -07:00
mdio-mux-mmioreg.c netdev/phy: mdio-mux-mmioreg.c should include of_address.h 2012-09-07 17:32:25 -04:00
mdio-mux.c netdev/phy: skip disabled mdio-mux nodes 2012-08-20 02:16:00 -07:00
mdio-octeon.c netdev: mdio-octeon.c: Convert to use device tree. 2012-07-23 13:54:53 +01:00
mdio_bus.c netdev/phy/of: Add more methods for binding PHY devices to drivers. 2012-06-27 21:23:25 -07:00
micrel.c phy/micrel: Rename KS80xx to KSZ80xx 2012-09-24 15:54:33 -04:00
national.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
phy.c mdio: translation of MMD EEE registers to/from ethtool settings 2012-08-22 22:58:27 -07:00
phy_device.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
qsemi.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
realtek.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
smsc.c net: phy: smsc: Implement PHY config_init for LAN87xx 2012-09-27 18:28:30 -04:00
spi_ks8995.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
ste10Xp.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
vitesse.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00