Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
bcm63xx.c	PHY: fix typo in bcm63xx PHY driver table	2010-04-13 03:29:36 -07:00
broadcom.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
cicada.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
davicom.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
et1011c.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
fixed.c
icplus.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
Kconfig	drivers/net/phy: micrel phy driver	2010-05-03 15:43:26 -07:00
lxt.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
Makefile	drivers/net/phy: micrel phy driver	2010-05-03 15:43:26 -07:00
marvell.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_bus.c
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	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
mdio-octeon.c	NET: mdio-octeon: Enable the hardware before using it.	2010-04-30 20:52:52 +01:00
micrel.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
national.c	drivers/net: Remove unnecessary returns from void function()s	2010-05-14 00:19:28 -07:00
phy_device.c
phy.c
qsemi.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
realtek.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
smsc.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
ste10Xp.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
vitesse.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00