tree f7fd50888b456b559ef58892b33f2f263a49a0a6
parent c63dbbd5268c397f051e0e0f665799ef64a1f3a4
parent 30c4eaafac80cc110efa66d2dfc551386eefdf53
author Linus Torvalds <torvalds@linux-foundation.org> 1326753334 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326753334 -0800

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

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  menuconfig: fix a regression when canceling the prompt dialog at exit
  kbuild: Fix compiler warning with assertion when calling 'fwrite'
  Improve update-po-config output
  menuconfig: let make not report error when not save configuration
  merge_config.sh: fix bug in final check
  merge_config.sh: whitespace cleanup
  merge_config.sh: use signal names compatible with dash and bash
  kconfig: add merge_config.sh script
  kconfig: use xfwrite wrapper function to silence warnings
  kconfig: fix set but not used warnings
  kconfig: fix warnings by specifing format arguments