From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v2.6.36-rc1~29
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9a459f6812fc26e0eb24bbe9c388000e23f67f6b;p=karo-tx-linux.git

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/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