From: Michal Marek <mmarek@suse.cz>
Date: Fri, 2 Jul 2010 09:56:52 +0000 (+0200)
Subject: Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes
X-Git-Tag: firefly_0821_release~9833^2~1447^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=62052be3a797f26f6f0fe30fc8d7f40ab54e08fd;p=firefly-linux-kernel-4.4.55.git

Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes

Conflicts:
	Makefile
---

62052be3a797f26f6f0fe30fc8d7f40ab54e08fd