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> |
||
|---|---|---|
| .. | ||
| ems_pci.c | ||
| Kconfig | ||
| kvaser_pci.c | ||
| Makefile | ||
| plx_pci.c | ||
| sja1000_isa.c | ||
| sja1000_of_platform.c | ||
| sja1000_platform.c | ||
| sja1000.c | ||
| sja1000.h | ||