Compare: 08b84f50cab2b9a9a4c7 vs 9776f5e72c1bab4c42f3

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'powerpc-next'
Date:	July 23, 2008, 1:08 a.m.	Sept. 24, 2008, 3:02 p.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	9776f5e72c1bab4c42f3ce1b8f27cefac1cf1c09
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)	3c1b272669b8c554cb9e (compare)
Next:	48a5bbac108bc291bff0 (compare)	6603cb5312d66c28c5d1 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Sep 24 2008, 15:39	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	Sep 24 2008, 15:18	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Sep 24 2008, 15:11	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Sep 24 2008, 15:08	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Sep 24 2008, 15:06	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Sep 24 2008, 15:02	galak/pseries_defconfig/default

Status	Date/time	Target	Status	Date/time	Target
OK	Jul 23 2008, 01:24	galak/i386_defconfig/i386-gcc4.6	Failed	Sep 24 2008, 15:32	galak/i386_defconfig/i386-gcc4.6