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
..
amd-rng.c
core.c
geode-rng.c
intel-rng.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ixp4xx-rng.c
Kconfig	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
Makefile
mxc-rnga.c
n2-asm.S
n2-drv.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
n2rng.h
nomadik-rng.c
octeon-rng.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
omap-rng.c
pasemi-rng.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
timeriomem-rng.c
tx4939-rng.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
via-rng.c
virtio-rng.c	virtio-rng: use virtqueue_xxx wrappers	2010-05-19 22:15:45 +09:30