forked from luck/tmp_suning_uos_patched
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> |
||
---|---|---|
.. | ||
cpufreq.c | ||
dma_lib.c | ||
gpio_mdio.c | ||
idle.c | ||
iommu.c | ||
Kconfig | ||
Makefile | ||
misc.c | ||
pasemi.h | ||
pci.c | ||
powersave.S | ||
setup.c | ||
time.c |