Compare: caca9510ff4e5d842c05 vs dc822e57ee05856291a8

kisskb

Description:	firmware loader: allow builtin firmware load even if usermodehelper is disabled	ARM: EXYNOS4: Fix the merge conflict
Date:	Aug. 25, 2011, 2:57 p.m.	Nov. 6, 2011, 6:03 a.m.
Hash:	caca9510ff4e5d842c0589110243d60927836222	dc822e57ee05856291a8c9324d2309076ee5f5e2
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	39% 76/194	16% 32/194
Successful:	22% 17/76	50% 16/32
Previous:	14c62e78dc1379185515 (compare)	5c8a0fbba543d9428a48 (compare)
Next:	cbbfa38fcb95930babc5 (compare)	06d8eb1b7d1eb34c7653 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Aug 26 2011, 03:17	linus/edosk7760_defconfig/sh4-gcc4.6	OK	Nov 6 2011, 10:53	linus/edosk7760_defconfig/sh4-gcc4.6
Failed	Aug 26 2011, 03:15	linus/dreamcast_defconfig/sh4-gcc4.6	OK	Nov 6 2011, 10:50	linus/dreamcast_defconfig/sh4-gcc4.6
Failed	Aug 26 2011, 03:10	linus/ap325rxa_defconfig/sh4-gcc4.6	OK	Nov 6 2011, 10:45	linus/ap325rxa_defconfig/sh4-gcc4.6
Failed	Aug 26 2011, 01:43	linus/ip32_defconfig/mips-gcc4.6	OK	Nov 6 2011, 09:06	linus/ip32_defconfig/mips-gcc4.6
Failed	Aug 26 2011, 00:36	linus/sh-allnoconfig/sh4-gcc4.6	OK	Nov 6 2011, 07:44	linus/sh-allnoconfig/sh4-gcc4.6

Status	Date/time	Target	Status	Date/time	Target
OK	Aug 26 2011, 01:14	linus/i386-randconfig/i386-gcc4.6	Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6
OK	Aug 26 2011, 00:25	linus/avr32-defconfig/avr32	Failed	Nov 6 2011, 07:32	linus/avr32-defconfig/avr32