Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 00:57:56 +0000 (17:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 00:57:56 +0000 (17:57 -0700)
commit9a459f6812fc26e0eb24bbe9c388000e23f67f6b
treec79cf75032eb432a5e9bc7c4b366267f32843416
parent090b710e8a0b7fe6f4752c5a439261f955075ebc
parent55c640c3abff301eed5ee11c34a40bfe043c8c2d
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
Makefile