lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
940370fc86
linux-kernel-test/drivers/char/hw_random
History
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 hwrng: Use PCI_VDEVICE 2009-06-25 13:50:53 +08:00
core.c hwrng: core - Fix double unlock in rng_dev_read 2009-12-23 23:22:34 +08:00
geode-rng.c hwrng: Use PCI_VDEVICE 2009-06-25 13:50:53 +08:00
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 [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
Kconfig Merge with mainline to remove plat-omap/Kconfig conflict 2010-03-01 14:19:05 -08:00
Makefile hwrng: nomadik - Add hardware RNG driver 2009-12-19 19:45:43 +08:00
mxc-rnga.c i.MX31: Add hw-random for RNGA 2009-05-07 16:17:16 +02:00
n2-asm.S sparc64: Add Niagara2 RNG driver. 2008-07-18 00:46:09 -07:00
n2-drv.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
n2rng.h sparc64: Add Niagara2 RNG driver. 2008-07-18 00:46:09 -07:00
nomadik-rng.c hwrng: nomadik - Add hardware RNG driver 2009-12-19 19:45:43 +08:00
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 omap: rng: Use resource_size instead of manual calculation 2009-09-24 16:23:18 -07:00
pasemi-rng.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
timeriomem-rng.c hwrng: timeriomem - Fix potential oops (request_mem_region/__devinit) 2009-06-03 19:28:03 +10:00
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 hwrng: via_rng - Support VIA Nano hardware RNG 2009-06-02 14:04:53 +10:00
virtio-rng.c virtio-rng: use virtqueue_xxx wrappers 2010-05-19 22:15:45 +09:30