[GIT] kconfig for v3.4-rc1

From: Michal Marek
Date: Fri Mar 30 2012 - 18:28:15 EST

Hi Linus,

please pull these kconfig bits for 3.4-rc1. There is one fix for make
oldconfig by Arnaud and updates to the merge_config.sh tool.


The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:

Linux 3.3-rc1 (2012-01-19 15:04:48 -0800)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kconfig

Arnaud Lacombe (1):
kconfig: fix new choices being skipped upon config update

John Stultz (2):
merge_config.sh: Set execute bit
merge_config.sh: Add option to display redundant configs

Josh Boyer (1):
merge_config.sh: Use the first file as the initial config

scripts/kconfig/confdata.c | 26 ++++++--------------------
scripts/kconfig/merge_config.sh | 15 ++++++++++++++-
scripts/kconfig/symbol.c | 9 ++++++++-
3 files changed, 28 insertions(+), 22 deletions(-)
mode change 100644 => 100755 scripts/kconfig/merge_config.sh
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/