Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2011 01:13:09 +0000 (18:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2011 01:13:09 +0000 (18:13 -0700)
* '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


Trivial merge