From: Michal Marek Date: Fri, 2 Jul 2010 09:56:52 +0000 (+0200) Subject: Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes X-Git-Tag: v2.6.35-rc4~7^2 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=62052be3a797f26f6f0fe30fc8d7f40ab54e08fd;p=cascardo%2Flinux.git Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes Conflicts: Makefile --- 62052be3a797f26f6f0fe30fc8d7f40ab54e08fd