tree b6cf372f3d7fbe993b04877312f67d824e5a1aa2
parent 949dd370c9718ede195ecdf9c60d520d1088d374
author Tom Stellard <thomas.stellard@amd.com> 1465011788 +0000
committer Tom Stellard <thomas.stellard@amd.com> 1465011788 +0000

Merging r257663:

------------------------------------------------------------------------
r257663 | dimitry | 2016-01-13 11:48:50 -0800 (Wed, 13 Jan 2016) | 4 lines

Remove bashism from merge.sh: POSIX sh does not have the `function`
reserved word, and it is even superfluous in bash, for this particular
instance.

------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@271772 91177308-0d34-0410-b5e6-96231b3b80d8