Compare: dc822e57ee05856291a8 vs e4fcd69c9e4e273352e0

kisskb

Description:	ARM: EXYNOS4: Fix the merge conflict	Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus
Date:	Nov. 6, 2011, 6:03 a.m.	Oct. 20, 2011, 1:31 a.m.
Hash:	dc822e57ee05856291a8c9324d2309076ee5f5e2	e4fcd69c9e4e273352e0f87cabd9648606da0c3e
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	16% 32/194	49% 96/194
Successful:	50% 16/32	63% 61/96
Previous:	5c8a0fbba543d9428a48 (compare)	bcd5cff7216f9b2de0a1 (compare)
Next:	06d8eb1b7d1eb34c7653 (compare)	486cf46f3f9be5f2a966 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6	OK	Oct 20 2011, 04:41	linus/i386-randconfig/i386-gcc4.6
Failed	Nov 6 2011, 08:25	linus/x86_64-randconfig/x86_64-gcc4.6	OK	Oct 20 2011, 04:36	linus/x86_64-randconfig/x86_64-gcc4.6
Failed	Nov 6 2011, 07:32	linus/avr32-defconfig/avr32	OK	Oct 20 2011, 03:43	linus/avr32-defconfig/avr32
Failed	Nov 6 2011, 07:22	linus/s390-allyesconfig/s390x-gcc4.6	OK	Oct 20 2011, 03:32	linus/s390-allyesconfig/s390x-gcc4.6
Failed	Nov 6 2011, 07:12	linus/s390-allmodconfig/s390x-gcc4.6	OK	Oct 20 2011, 03:21	linus/s390-allmodconfig/s390x-gcc4.6