Compare: 08b84f50cab2b9a9a4c7 vs 650d4f892bef9037181d

kisskb

Description:	Fix minor merge conflict difference	Merge remote branch 'linus/master'
Date:	July 23, 2008, 1:08 a.m.	Aug. 14, 2008, 2:02 p.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	650d4f892bef9037181d81f2e62e5c59b107f652
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 14/0
Successful:	53% 7/13	92% 13/14
Previous:	e6a2a8e701a38ed1c324 (compare)	370608676a55312204d6 (compare)
Next:	48a5bbac108bc291bff0 (compare)	9c1a9198ab6f1baae3e3 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Aug 14 2008, 14:38	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Aug 14 2008, 14:11	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Aug 14 2008, 14:08	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Aug 14 2008, 14:06	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Aug 14 2008, 14:02	galak/pseries_defconfig/default