Compare: 7f4dfde2a48b92c4c320 vs 08b84f50cab2b9a9a4c7

kisskb

Description:	Merge remote branch 'linus/master'	Fix minor merge conflict difference
Date:	July 29, 2008, 6:02 a.m.	July 23, 2008, 1:08 a.m.
Hash:	7f4dfde2a48b92c4c320cfbfbf9df16ff7b69e8d	08b84f50cab2b9a9a4c7822fe6211230d7179072
Branches:	galak	galak
Gitweb:	git.kernel.org	git.kernel.org
Progress:	0% 13/0	0% 13/0
Successful:	92% 12/13	53% 7/13
Previous:	6c0ec1387ca76eaf1614 (compare)	e6a2a8e701a38ed1c324 (compare)
Next:	722a83ceceef58186380 (compare)	48a5bbac108bc291bff0 (compare)

Status	Date/time	Target	Status	Date/time	Target
OK	Jul 29 2008, 06:25	galak/mpc885_ads_defconfig/default	Failed	Jul 23 2008, 01:31	galak/mpc885_ads_defconfig/default
OK	Jul 29 2008, 06:16	galak/powerpc-allmodconfig/default	Failed	Jul 23 2008, 01:22	galak/powerpc-allmodconfig/default
OK	Jul 29 2008, 06:10	galak/ppc64_defconfig/default	Failed	Jul 23 2008, 01:16	galak/ppc64_defconfig/default
OK	Jul 29 2008, 06:07	galak/iseries_defconfig/default	Failed	Jul 23 2008, 01:13	galak/iseries_defconfig/default
OK	Jul 29 2008, 06:05	galak/cell_defconfig/default	Failed	Jul 23 2008, 01:11	galak/cell_defconfig/default