From: John Stultz <john.stultz@linaro.org>
Date: Thu, 22 Mar 2012 22:05:48 +0000 (-0700)
Subject: merge_config.sh: Set execute bit
X-Git-Tag: MMI-PSA29.97-13-9~17095^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=55cae3043a48e01f8fc31e8aecc3062c4767a27d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
old mode 100644
new mode 100755