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> |
||
---|---|---|
.. | ||
amd-rng.c | ||
core.c | ||
geode-rng.c | ||
intel-rng.c | ||
ixp4xx-rng.c | ||
Kconfig | ||
Makefile | ||
mxc-rnga.c | ||
n2-asm.S | ||
n2-drv.c | ||
n2rng.h | ||
nomadik-rng.c | ||
octeon-rng.c | ||
omap-rng.c | ||
pasemi-rng.c | ||
timeriomem-rng.c | ||
tx4939-rng.c | ||
via-rng.c | ||
virtio-rng.c |