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
..
amcc	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
geode-aes.c	crypto: geode-aes - Fix some code style issues	2010-04-19 21:02:41 +08:00
geode-aes.h
hifn_795x.c	crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk	2010-05-19 13:56:37 +10:00
ixp4xx_crypto.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
Kconfig	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
Makefile	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
mv_cesa.c	crypto: mv_cesa - Use resource_size	2010-05-14 14:58:05 +10:00
mv_cesa.h	crypto: mv_cesa - Add sha1 and hmac(sha1) async hash drivers	2010-04-13 16:50:49 +08:00
n2_asm.S	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
n2_core.c	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
n2_core.h	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
omap-sham.c	crypto: omap - sha1 & md5 driver	2010-05-03 11:10:59 +08:00
padlock-aes.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
padlock-sha.c	crypto: padlock-sha - Add import/export support	2010-02-02 06:50:25 +11:00
padlock.h
talitos.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
talitos.h	crypto: talitos - add support for sha224	2010-05-19 19:21:53 +10:00