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

Conflicts:
	drivers/net/qlcnic/qlcnic_init.c
	net/ipv4/ip_output.c

2010-09-27 01:03:03 -07:00

..

core.c

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

2010-09-27 01:03:03 -07:00

core.h

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

debug.c

Input: sysrq - drop tty argument from sysrq ops handlers

2010-08-19 22:07:06 -07:00

debug.h

of: Always use 'struct device.of_node' to get device node pointer.

2010-05-18 16:10:44 -06:00

emac.h

ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts

2009-11-18 05:11:09 -08:00

Kconfig

Merge commit 'origin'

2008-10-15 11:31:54 +11:00

Makefile

Device tree aware EMAC driver

2007-10-10 16:51:52 -07:00

mal.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

mal.h

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

phy.c

net: variables reach -1, but 0 tested

2009-02-02 21:39:02 -08:00

phy.h

ibm_newemac: Add support for GPCS, SGMII and M88E1112 PHY

2008-10-02 13:06:42 -04:00

rgmii.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

rgmii.h

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

tah.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

tah.h

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

zmii.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

zmii.h

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00