Compare: dc822e57ee05856291a8 vs c7f46b7aa4ae5cbef32e

kisskb

Description:	ARM: EXYNOS4: Fix the merge conflict	Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Date:	Nov. 6, 2011, 6:03 a.m.	Jan. 1, 2012, 8:01 a.m.
Hash:	dc822e57ee05856291a8c9324d2309076ee5f5e2	c7f46b7aa4ae5cbef32eb5e016512a14f936affa
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	16% 32/194	55% 107/194
Successful:	50% 16/32	67% 72/107
Previous:	5c8a0fbba543d9428a48 (compare)	06867fbb8abc93619219 (compare)
Next:	06d8eb1b7d1eb34c7653 (compare)	733bbb7e1c3acb8fabc5 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Nov 6 2011, 10:06	linus/m68k-allmodconfig/m68k-gcc8	OK	Jan 1 2012, 09:33	linus/m68k-allmodconfig/m68k-gcc8
Failed	Nov 6 2011, 08:34	linus/i386-randconfig/i386-gcc4.6	OK	Jan 1 2012, 08:54	linus/i386-randconfig/i386-gcc4.6
Failed	Nov 6 2011, 08:25	linus/x86_64-randconfig/x86_64-gcc4.6	OK	Jan 1 2012, 08:51	linus/x86_64-randconfig/x86_64-gcc4.6
Failed	Nov 6 2011, 07:22	linus/s390-allyesconfig/s390x-gcc4.6	OK	Jan 1 2012, 08:23	linus/s390-allyesconfig/s390x-gcc4.6
Failed	Nov 6 2011, 07:12	linus/s390-allmodconfig/s390x-gcc4.6	OK	Jan 1 2012, 08:16	linus/s390-allmodconfig/s390x-gcc4.6