tree 7a64165d7ca0f1dc813d98efcbe4898e28a8cdc1
parent e7d33bb5ea82922e6ddcfc6b28a630b1a4ced071
parent 0d0e7718a9da789dec7932b7411ab16047540c4f
author Linus Torvalds <torvalds@linux-foundation.org> 1378608410 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1378608410 -0700

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

Pull kbuild update from Michal Marek:
 "Only these two commits are in the kbuild branch this time:
   - Using filechk for include/config/kernel.release
   - Cleanup in scripts/sortextable.c"

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Do not overwrite include/config/kernel.release needlessly
  scripts: remove unused function in sortextable.c