android@builduntu:~/rr$ ./cherrypick.sh
From https://github.com/Druboo666/msm7x30-3.4.x-nAa
 * branch            cm-11.0-linaro -> FETCH_HEAD
Not currently on any branch.
You are currently cherry-picking commit fe2ff02.

nothing to commit, working directory clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git reset'
From https://github.com/Druboo666/msm7x30-3.4.x-nAa
 * branch            cm-11.0-linaro -> FETCH_HEAD
error: could not apply c351dc4... SEMC Compatible
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
error: Could not parse conflict hunks in Makefile