Compare: dc822e57ee05856291a8 vs 0f86267b79bc6e357b86

kisskb

Description:	ARM: EXYNOS4: Fix the merge conflict	Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux
Date:	Nov. 6, 2011, 6:03 a.m.	Oct. 4, 2011, 1:02 p.m.
Hash:	dc822e57ee05856291a8c9324d2309076ee5f5e2	0f86267b79bc6e357b8606077c7f70239045ea9c
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	16% 32/194	55% 108/194
Successful:	50% 16/32	61% 66/108
Previous:	5c8a0fbba543d9428a48 (compare)	47ea91b4052d9e94b9dc (compare)
Next:	06d8eb1b7d1eb34c7653 (compare)	976d167615b64e14bc14 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6	OK	Oct 4 2011, 18:07	linus/i386-randconfig/i386-gcc4.6
Failed	Nov 6 2011, 08:25	linus/x86_64-randconfig/x86_64-gcc4.6	OK	Oct 4 2011, 17:59	linus/x86_64-randconfig/x86_64-gcc4.6
Failed	Nov 6 2011, 07:32	linus/avr32-defconfig/avr32	OK	Oct 4 2011, 17:08	linus/avr32-defconfig/avr32
Failed	Nov 6 2011, 07:22	linus/s390-allyesconfig/s390x-gcc4.6	OK	Oct 4 2011, 16:57	linus/s390-allyesconfig/s390x-gcc4.6
Failed	Nov 6 2011, 07:12	linus/s390-allmodconfig/s390x-gcc4.6	OK	Oct 4 2011, 16:46	linus/s390-allmodconfig/s390x-gcc4.6

Status	Date/time	Target	Status	Date/time	Target
OK	Nov 6 2011, 09:06	linus/ip32_defconfig/mips-gcc4.6	Failed	Oct 4 2011, 18:41	linus/ip32_defconfig/mips-gcc4.6