Compare: 08b84f50cab2b9a9a4c7 vs 0888ae5ee35346501eb8

kisskb

Description:	Fix minor merge conflict difference	Merge remote branch 'linus/master'
Date:	July 23, 2008, 1:08 a.m.	May 15, 2008, 7:59 p.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	0888ae5ee35346501eb84614cab4916890179663
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)	09c2923d35eb841c6abc (compare)
Next:	48a5bbac108bc291bff0 (compare)	f09f08a14fb303a4372b (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	May 15 2008, 20:28	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	May 15 2008, 20:16	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	May 15 2008, 20:09	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	May 15 2008, 20:06	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	May 15 2008, 20:03	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	May 15 2008, 19:59	galak/pseries_defconfig/default