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