Compare: dc822e57ee05856291a8 vs 401d0069cb344f401bc9

kisskb

Description:	ARM: EXYNOS4: Fix the merge conflict	Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6
Date:	Nov. 6, 2011, 6:03 a.m.	Nov. 28, 2011, 8:02 a.m.
Hash:	dc822e57ee05856291a8c9324d2309076ee5f5e2	401d0069cb344f401bc9d264c31db55876ff78c0
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	16% 32/194	54% 106/194
Successful:	50% 16/32	63% 67/106
Previous:	5c8a0fbba543d9428a48 (compare)	aaa0b4f00729d5530b7d (compare)
Next:	06d8eb1b7d1eb34c7653 (compare)	4244cb482e8eab181421 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Nov 6 2011, 10:06	linus/m68k-allmodconfig/m68k-gcc8	OK	Nov 29 2011, 02:57	linus/m68k-allmodconfig/m68k-gcc8
Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6	OK	Nov 29 2011, 02:15	linus/i386-randconfig/i386-gcc4.6
Failed	Nov 6 2011, 08:25	linus/x86_64-randconfig/x86_64-gcc4.6	OK	Nov 29 2011, 02:12	linus/x86_64-randconfig/x86_64-gcc4.6
Failed	Nov 6 2011, 07:22	linus/s390-allyesconfig/s390x-gcc4.6	OK	Nov 29 2011, 01:44	linus/s390-allyesconfig/s390x-gcc4.6
Failed	Nov 6 2011, 07:12	linus/s390-allmodconfig/s390x-gcc4.6	OK	Nov 29 2011, 01:37	linus/s390-allmodconfig/s390x-gcc4.6