Compare: 65112dccf8a113737684 vs dc822e57ee05856291a8

kisskb

Description:	Merge git://git.samba.org/sfrench/cifs-2.6	ARM: EXYNOS4: Fix the merge conflict
Date:	Oct. 10, 2011, 3:02 p.m.	Nov. 6, 2011, 6:03 a.m.
Hash:	65112dccf8a113737684366349d7f9ec373ddc47	dc822e57ee05856291a8c9324d2309076ee5f5e2
Branches:	linus	linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	55% 108/194	16% 32/194
Successful:	64% 70/108	50% 16/32
Previous:	3ee72ca99288f1de95ec (compare)	5c8a0fbba543d9428a48 (compare)
Next:	37cf95162af4036b4198 (compare)	06d8eb1b7d1eb34c7653 (compare)

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