Compare: 08b84f50cab2b9a9a4c7 vs 49fdf6785fd660e18a1e

kisskb

Description:	Fix minor merge conflict difference	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
Date:	July 23, 2008, 1:08 a.m.	Oct. 29, 2008, 12:11 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	49fdf6785fd660e18a1eb4588928f47e9fa29a9a
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)	57f8f7b60db6f1ed2c69 (compare)
Next:	48a5bbac108bc291bff0 (compare)	75fa67706cce5272bcfc (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Nov 1 2008, 01:26	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	Nov 1 2008, 01:02	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Oct 31 2008, 23:53	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Oct 31 2008, 23:50	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Oct 31 2008, 23:47	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Oct 31 2008, 23:43	galak/pseries_defconfig/default