From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Mar 2011 01:13:09 +0000 (-0700)
Subject: Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: v2.6.39-rc1~405
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b87a2d3e3147bd140da2eae584772c353d11421b;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  scripts/extract-ikconfig: add xz compression support
  kbuild: add GNU GLOBAL tags generation
  setlocalversion: update mercurial tag parsing
---

b87a2d3e3147bd140da2eae584772c353d11421b