Compare: 08b84f50cab2b9a9a4c7 vs 02169b40ccfc167b5694

kisskb

Description:	Fix minor merge conflict difference	Merge remote branch 'linus/master'
Date:	July 23, 2008, 1:08 a.m.	June 17, 2008, 3:04 a.m.
Hash:	08b84f50cab2b9a9a4c7822fe6211230d7179072	02169b40ccfc167b56943db58849c4cf8ac8999c
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)	504ab40026b03d819972 (compare)
Next:	48a5bbac108bc291bff0 (compare)	97285c7633af79afd6ec (compare)

Status	Date/time	Target	Status	Date/time	Target
Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default	OK	Jun 17 2008, 03:50	galak/mpc885_ads_defconfig/default
Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default	OK	Jun 17 2008, 03:33	galak/powerpc-allmodconfig/default
Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default	OK	Jun 17 2008, 03:21	galak/ppc64_defconfig/default
Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default	OK	Jun 17 2008, 03:14	galak/iseries_defconfig/default
Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default	OK	Jun 17 2008, 03:09	galak/cell_defconfig/default
Failed	Jul 23 2008, 01:08	galak/pseries_defconfig/default	OK	Jun 17 2008, 03:04	galak/pseries_defconfig/default