fatal: 'cherry-pick' is not possible because you have unmerged files

[Tommy Lu]

Hi guys;
I want download the kernel source of android-2.6.35 for
PandaBoard,and it finished.But when I add the kernel patch ,there is
some error:
$git fetch http://review.omapzoom.org/p/kernel/omap refs/changes/
61/13861/1 && git cherry-pick FETCH_HEAD
remote: Counting objects: 36119, done
remote: Finding sources: 100% (6/6)
Unpacking objects: 100% (6/6), done.
From http://review.omapzoom.org/p/kernel/omap
* branch refs/changes/61/13861/1 -> FETCH_HEAD
fatal: 'cherry-pick' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as
appropriate to mark resolution and make a commit, or use 'git commit -
a'.

I download the source file and patch just like this web:http://
www.omappedia.org/wiki/PandaBoard_L27.12.1-P2_Release_Notes#Kernel_.26_Driver_Source

What can i do ?
Regards
Tommy Lu