tree c79cf75032eb432a5e9bc7c4b366267f32843416
parent 090b710e8a0b7fe6f4752c5a439261f955075ebc
parent 55c640c3abff301eed5ee11c34a40bfe043c8c2d
author Linus Torvalds <torvalds@linux-foundation.org> 1281747476 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281747476 -0700

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