David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-22 03:23:13 -04:00

..

bcm63xx.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

broadcom.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

cicada.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

davicom.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

dp83640_reg.h

ptp: Added a clock driver for the National Semiconductor PHYTER.

2011-05-23 13:10:23 -07:00

dp83640.c

dp83640: increase receive time stamp buffer size

2011-08-07 22:53:22 -07:00

et1011c.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

fixed.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

icplus.c

net/phy: add IC+ IP101A and support APS.

2011-09-20 15:50:29 -04:00

Kconfig

drivers/net: Kconfig & Makefile cleanup

2011-08-27 00:58:49 -07:00

lxt.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

Makefile

ptp: Added a clock driver for the National Semiconductor PHYTER.

2011-05-23 13:10:23 -07:00

marvell.c

of/phylib: Use device tree properties to initialize Marvell PHYs.

2010-11-22 08:34:23 -08:00

mdio_bus.c

phylib: fix PAL state machine restart on resume

2010-09-14 14:31:03 -07:00

mdio-bitbang.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-04-11 14:53:53 -07:00

mdio-gpio.c

dt/net: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:44 -07:00

mdio-octeon.c

netdev: mdio-octeon: Fix section mismatch errors.

2010-06-28 23:58:54 -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

net/phy: fix DP83865 phy interrupt handler

2011-08-26 12:48:24 -04:00

phy_device.c

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

phy.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

qsemi.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

realtek.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

smsc.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

ste10Xp.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00

vitesse.c

net/phy: fix many "defined but unused" warnings

2010-10-05 00:34:29 -07:00