merge_config.sh: Set execute bit
authorJohn Stultz <john.stultz@linaro.org>
Thu, 22 Mar 2012 22:05:48 +0000 (15:05 -0700)
committerMichal Marek <mmarek@suse.cz>
Fri, 30 Mar 2012 13:10:48 +0000 (15:10 +0200)
commit55cae3043a48e01f8fc31e8aecc3062c4767a27d
tree041275bacd3a4bc26dbc6a965fe883f500311447
parent09280615a0d924b3ab79acbff950f92c3420fd76
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>
scripts/kconfig/merge_config.sh [changed mode: 0644->0755]