Compare: 08b84f50cab2b9a9a4c7 vs 247f44569e25bb6bd50b

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'powerpc-next'
Date:	July 23, 2008, 1:08 a.m.	Oct. 14, 2008, 7:02 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	247f44569e25bb6bd50b0264b6f97bb832204c3c
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 14/0
Successful:	53% 7/13	85% 12/14
Previous:	e6a2a8e701a38ed1c324 (compare)	a2d5981d5a223c9a77ff (compare)
Next:	48a5bbac108bc291bff0 (compare)	ccf3fc959a2c70fb26e3 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Oct 14 2008, 07:32	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Oct 14 2008, 07:11	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Oct 14 2008, 07:08	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Oct 14 2008, 07:06	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Oct 14 2008, 07:02	galak/pseries_defconfig/default