Compare: 08b84f50cab2b9a9a4c7 vs 314339d55a9f484d89e6

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'powerpc-next'
Date:	July 23, 2008, 1:08 a.m.	June 10, 2008, 1:04 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	314339d55a9f484d89e6d7c444e8fa2d6f6227dc
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 13/0
Successful:	53% 7/13	92% 12/13
Previous:	e6a2a8e701a38ed1c324 (compare)	801aaf76e02c12caba4e (compare)
Next:	48a5bbac108bc291bff0 (compare)	504ab40026b03d819972 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Jun 10 2008, 01:31	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	Jun 10 2008, 01:15	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Jun 10 2008, 01:08	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Jun 10 2008, 01:06	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Jun 10 2008, 01:04	galak/pseries_defconfig/default