Compare: dc822e57ee05856291a8 vs 11d814a20166461358e1

kisskb

Description:	ARM: EXYNOS4: Fix the merge conflict	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Date:	Nov. 6, 2011, 6:03 a.m.	Dec. 2, 2011, 1:02 a.m.
Hash:	dc822e57ee05856291a8c9324d2309076ee5f5e2	11d814a20166461358e1cefaf6bcd425698b8460
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	16% 32/194	22% 43/194
Successful:	50% 16/32	65% 28/43
Previous:	5c8a0fbba543d9428a48 (compare)	883381d9f1c5a6329bbb (compare)
Next:	06d8eb1b7d1eb34c7653 (compare)	b930c26416c4ea685572 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Nov 6 2011, 10:06	linus/m68k-allmodconfig/m68k-gcc8	OK	Dec 2 2011, 03:34	linus/m68k-allmodconfig/m68k-gcc8
Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6	OK	Dec 2 2011, 02:52	linus/i386-randconfig/i386-gcc4.6
Failed	Nov 6 2011, 08:25	linus/x86_64-randconfig/x86_64-gcc4.6	OK	Dec 2 2011, 02:46	linus/x86_64-randconfig/x86_64-gcc4.6
Failed	Nov 6 2011, 07:22	linus/s390-allyesconfig/s390x-gcc4.6	OK	Dec 2 2011, 02:19	linus/s390-allyesconfig/s390x-gcc4.6
Failed	Nov 6 2011, 07:12	linus/s390-allmodconfig/s390x-gcc4.6	OK	Dec 2 2011, 02:12	linus/s390-allmodconfig/s390x-gcc4.6