Compare: 08b84f50cab2b9a9a4c7 vs 57f8f7b60db6f1ed2c69

kisskb

Description:	Fix minor merge conflict difference	Linux 2.6.28-rc1
Date:	July 23, 2008, 1:08 a.m.	Oct. 25, 2008, 12:02 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37
Branches:	galak	galak, linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 14/0
Successful:	53% 7/13	100% 14/14
Previous:	e6a2a8e701a38ed1c324 (compare)	2d7282840e1652883c78 (compare)
Next:	48a5bbac108bc291bff0 (compare)	49fdf6785fd660e18a1e (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Oct 25 2008, 05:42	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	Oct 25 2008, 05:19	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Oct 25 2008, 05:12	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Oct 25 2008, 05:09	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Oct 25 2008, 05:06	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Oct 25 2008, 05:02	galak/pseries_defconfig/default