cf9b59e9d3
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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| bcm63xx.c | ||
| broadcom.c | ||
| cicada.c | ||
| davicom.c | ||
| et1011c.c | ||
| fixed.c | ||
| icplus.c | ||
| lxt.c | ||
| marvell.c | ||
| mdio-bitbang.c | ||
| mdio-gpio.c | ||
| mdio-octeon.c | ||
| mdio_bus.c | ||
| micrel.c | ||
| national.c | ||
| phy.c | ||
| phy_device.c | ||
| qsemi.c | ||
| realtek.c | ||
| smsc.c | ||
| ste10Xp.c | ||
| vitesse.c | ||