Compare: dc822e57ee05856291a8 vs 1bf1aacedcda23c75e70

kisskb

Description:	ARM: EXYNOS4: Fix the merge conflict	Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung
Date:	Nov. 6, 2011, 6:03 a.m.	Oct. 23, 2011, 7:02 p.m.
Hash:	dc822e57ee05856291a8c9324d2309076ee5f5e2	1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	16% 32/194	55% 108/194
Successful:	50% 16/32	64% 70/108
Previous:	5c8a0fbba543d9428a48 (compare)	2efd7c0fdcbe041173e2 (compare)
Next:	06d8eb1b7d1eb34c7653 (compare)	6a0596583fadd15dca29 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6	OK	Oct 23 2011, 21:32	linus/i386-randconfig/i386-gcc4.6
Failed	Nov 6 2011, 08:25	linus/x86_64-randconfig/x86_64-gcc4.6	OK	Oct 23 2011, 21:23	linus/x86_64-randconfig/x86_64-gcc4.6
Failed	Nov 6 2011, 07:32	linus/avr32-defconfig/avr32	OK	Oct 23 2011, 20:31	linus/avr32-defconfig/avr32
Failed	Nov 6 2011, 07:22	linus/s390-allyesconfig/s390x-gcc4.6	OK	Oct 23 2011, 20:19	linus/s390-allyesconfig/s390x-gcc4.6
Failed	Nov 6 2011, 07:12	linus/s390-allmodconfig/s390x-gcc4.6	OK	Oct 23 2011, 20:09	linus/s390-allmodconfig/s390x-gcc4.6