Compare: fc5abbc0149fe384939e vs 08b84f50cab2b9a9a4c7

kisskb

Description:	Merge branch 'powerpc-next'	Fix minor merge conflict difference
Date:	June 3, 2008, 4:26 p.m.	July 23, 2008, 1:08 a.m.
Hash:	fc5abbc0149fe384939ec931b52fdfbddd24ccb9	08b84f50cab2b9a9a4c7822fe6211230d7179072
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 13/0
Successful:	100% 13/13	53% 7/13
Previous:	64b896ea854dc563ee3b (compare)	e6a2a8e701a38ed1c324 (compare)
Next:	801aaf76e02c12caba4e (compare)	48a5bbac108bc291bff0 (compare)

Status	Date/time	Target	Status	Date/time	Target
OK	Jun 3 2008, 16:56	galak/mpc885_ads_defconfig/default	Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default
OK	Jun 3 2008, 16:43	galak/powerpc-allmodconfig/default	Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default
OK	Jun 3 2008, 16:35	galak/ppc64_defconfig/default	Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default
OK	Jun 3 2008, 16:32	galak/iseries_defconfig/default	Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default
OK	Jun 3 2008, 16:30	galak/cell_defconfig/default	Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default
OK	Jun 3 2008, 16:26	galak/pseries_defconfig/default	Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default