Compare: 08b84f50cab2b9a9a4c7 vs 6eefad4375b77160fc85

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'powerpc-next'
Date:	July 23, 2008, 1:08 a.m.	July 4, 2008, 6:46 p.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	6eefad4375b77160fc855133907ba62a363a9505
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 13/0
Successful:	53% 7/13	100% 13/13
Previous:	e6a2a8e701a38ed1c324 (compare)	436e0e36be5b8375e98e (compare)
Next:	48a5bbac108bc291bff0 (compare)	ba9737881fca2ec48dc3 (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Jul 4 2008, 20:01	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	Jul 4 2008, 19:26	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Jul 4 2008, 18:54	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Jul 4 2008, 18:52	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Jul 4 2008, 18:50	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Jul 4 2008, 18:46	galak/pseries_defconfig/default