Compare: 08b84f50cab2b9a9a4c7 vs be06a4f8df099e72ca2e

kisskb

Description:	Fix minor merge conflict difference	Merge remote branch 'linus/master'
Date:	July 23, 2008, 1:08 a.m.	Aug. 6, 2008, 1:05 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	be06a4f8df099e72ca2ef356326a210dae657cf9
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 14/0
Successful:	53% 7/13	100% 14/14
Previous:	e6a2a8e701a38ed1c324 (compare)	4f4416ab50c66583ae6e (compare)
Next:	48a5bbac108bc291bff0 (compare)	370608676a55312204d6 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Aug 6 2008, 04:11	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	Aug 6 2008, 04:02	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Aug 6 2008, 03:56	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Aug 6 2008, 03:53	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Aug 6 2008, 03:51	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Aug 6 2008, 03:47	galak/pseries_defconfig/default