Compare: 9776f5e72c1bab4c42f3 vs 08b84f50cab2b9a9a4c7

kisskb

Description:	Merge branch 'powerpc-next'	Fix minor merge conflict difference
Date:	Sept. 24, 2008, 3:02 p.m.	July 23, 2008, 1:08 a.m.
Hash:	9776f5e72c1bab4c42f3ce1b8f27cefac1cf1c09	08b84f50cab2b9a9a4c7822fe6211230d7179072
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 14/0	0% 13/0
Successful:	92% 13/14	53% 7/13
Previous:	3c1b272669b8c554cb9e (compare)	e6a2a8e701a38ed1c324 (compare)
Next:	6603cb5312d66c28c5d1 (compare)	48a5bbac108bc291bff0 (compare)

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

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