projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53a94c7 ab94e46)
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

1  2 
Makefile patch | diff1 | diff2 | blob | history
scripts/tags.sh patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc scripts/tags.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.