Compare: f09f08a14fb303a4372b vs 08b84f50cab2b9a9a4c7

kisskb

Description:	Merge branch 'powerpc-next'	Fix minor merge conflict difference
Date:	May 16, 2008, 1:02 p.m.	July 23, 2008, 1:08 a.m.
Hash:	f09f08a14fb303a4372be0cde96e4e39546043cd	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:	0888ae5ee35346501eb8 (compare)	e6a2a8e701a38ed1c324 (compare)
Next:	cba00f4b5b6410b5d1e7 (compare)	48a5bbac108bc291bff0 (compare)

Status	Date/time	Target	Status	Date/time	Target
OK	May 16 2008, 13:40	galak/mpc885_ads_defconfig/default	Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default
OK	May 16 2008, 13:28	galak/powerpc-allmodconfig/default	Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default
OK	May 16 2008, 13:16	galak/ppc64_defconfig/default	Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default
OK	May 16 2008, 13:12	galak/iseries_defconfig/default	Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default
OK	May 16 2008, 13:08	galak/cell_defconfig/default	Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default
OK	May 16 2008, 13:02	galak/pseries_defconfig/default	Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default