Compare: 2efd7c0fdcbe041173e2 vs dc822e57ee05856291a8

kisskb

Description:	Merge git://github.com/herbertx/crypto	ARM: EXYNOS4: Fix the merge conflict
Date:	Oct. 22, 2011, 2:09 a.m.	Nov. 6, 2011, 6:03 a.m.
Hash:	2efd7c0fdcbe041173e248ccc2d9c91df7f84ce5	dc822e57ee05856291a8c9324d2309076ee5f5e2
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	55% 108/194	16% 32/194
Successful:	64% 70/108	50% 16/32
Previous:	fd11e153b82ad1c84ccc (compare)	5c8a0fbba543d9428a48 (compare)
Next:	1bf1aacedcda23c75e70 (compare)	06d8eb1b7d1eb34c7653 (compare)

Status	Date/time	Target	Status	Date/time	Target
OK	Oct 22 2011, 04:49	linus/i386-randconfig/i386-gcc4.6	Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6
OK	Oct 22 2011, 04:33	linus/x86_64-randconfig/x86_64-gcc4.6	Failed	Nov 6 2011, 08:25	linus/x86_64-randconfig/x86_64-gcc4.6
OK	Oct 22 2011, 03:40	linus/avr32-defconfig/avr32	Failed	Nov 6 2011, 07:32	linus/avr32-defconfig/avr32
OK	Oct 22 2011, 03:29	linus/s390-allyesconfig/s390x-gcc4.6	Failed	Nov 6 2011, 07:22	linus/s390-allyesconfig/s390x-gcc4.6
OK	Oct 22 2011, 03:18	linus/s390-allmodconfig/s390x-gcc4.6	Failed	Nov 6 2011, 07:12	linus/s390-allmodconfig/s390x-gcc4.6