Compare: dc822e57ee05856291a8 vs 8bc03e8f3a334e09e89a

kisskb

Description:	ARM: EXYNOS4: Fix the merge conflict	Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
Date:	Nov. 6, 2011, 6:03 a.m.	Oct. 17, 2011, 8:02 a.m.
Hash:	dc822e57ee05856291a8c9324d2309076ee5f5e2	8bc03e8f3a334e09e89a7dffb486ee97a5ce84ae
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)	4c41042d1d4c29e596b3 (compare)
Next:	06d8eb1b7d1eb34c7653 (compare)	a84a79e4d369a73c0130 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6	OK	Oct 17 2011, 11:31	linus/i386-randconfig/i386-gcc4.6
Failed	Nov 6 2011, 08:25	linus/x86_64-randconfig/x86_64-gcc4.6	OK	Oct 17 2011, 11:24	linus/x86_64-randconfig/x86_64-gcc4.6
Failed	Nov 6 2011, 07:32	linus/avr32-defconfig/avr32	OK	Oct 17 2011, 10:36	linus/avr32-defconfig/avr32
Failed	Nov 6 2011, 07:22	linus/s390-allyesconfig/s390x-gcc4.6	OK	Oct 17 2011, 10:25	linus/s390-allyesconfig/s390x-gcc4.6
Failed	Nov 6 2011, 07:12	linus/s390-allmodconfig/s390x-gcc4.6	OK	Oct 17 2011, 10:15	linus/s390-allmodconfig/s390x-gcc4.6