diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-03-22 15:05:48 -0700 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-03-30 15:10:48 +0200 |
| commit | 55cae3043a48e01f8fc31e8aecc3062c4767a27d (patch) | |
| tree | 041275bacd3a4bc26dbc6a965fe883f500311447 | |
| parent | 09280615a0d924b3ab79acbff950f92c3420fd76 (diff) | |
| download | linux-55cae3043a48e01f8fc31e8aecc3062c4767a27d.tar.gz linux-55cae3043a48e01f8fc31e8aecc3062c4767a27d.tar.bz2 linux-55cae3043a48e01f8fc31e8aecc3062c4767a27d.zip | |
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 <john.stultz@linaro.org>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rwxr-xr-x[-rw-r--r--] | scripts/kconfig/merge_config.sh | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 23d738a1acda..23d738a1acda 100644..100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh |