Compare: 08b84f50cab2b9a9a4c7 vs f7160c7573615ec82c69

kisskb

Description:	Fix minor merge conflict difference	Linux 2.6.28-rc4
Date:	July 23, 2008, 1:08 a.m.	Nov. 11, 2008, 12:04 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	f7160c7573615ec82c691e294cf80d920b5d588d
Branches:	galak	galak, linus
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 26/0
Successful:	53% 7/13	100% 26/26
Previous:	e6a2a8e701a38ed1c324 (compare)	75fa67706cce5272bcfc (compare)
Next:	48a5bbac108bc291bff0 (compare)	7f0f598a0069d1ab0723 (compare)

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