From 55cae3043a48e01f8fc31e8aecc3062c4767a27d Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 22 Mar 2012 15:05:48 -0700 Subject: merge_config.sh: Set execute bit Somehow the merge_config.sh script didn't get its execute bit set when it was merged. Fix this. Signed-off-by: John Stultz Acked-by: Darren Hart Acked-by: Bruce Ashfield Signed-off-by: Michal Marek --- scripts/kconfig/merge_config.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/kconfig/merge_config.sh (limited to 'scripts') diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh old mode 100644 new mode 100755 -- cgit v1.2.3