From: Linus Torvalds Date: Sat, 14 Aug 2010 00:57:56 +0000 (-0700) Subject: Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a459f6812fc26e0eb24bbe9c388000e23f67f6b;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'kbuild' of git://git./linux/kernel/git/mmarek/kbuild-2.6 * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: setlocalversion: fix version for untaged nontip mercurial revs Fix CONFIG_CROSS_COMPILE issue in .config --- 9a459f6812fc26e0eb24bbe9c388000e23f67f6b