Compare: 08b84f50cab2b9a9a4c7 vs 0b9ab079d8519561212f

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'powerpc-next'
Date:	July 23, 2008, 1:08 a.m.	May 28, 2008, 1:03 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	0b9ab079d8519561212f54dd7af4884822ad0b4c
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)	cddbfab7ed82266d2fc5 (compare)
Next:	48a5bbac108bc291bff0 (compare)	64b896ea854dc563ee3b (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	May 28 2008, 01:31	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	May 28 2008, 10:42	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	May 28 2008, 01:12	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	May 28 2008, 01:09	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	May 28 2008, 01:03	galak/pseries_defconfig/default