Hey! I had the same problem, and I didn't cope with this error by using "git am". But I tried to use "git add *.txt" and then "git commit". I don't know if this way is right, but after cheking file "device.c" I found out that patch has been applied. But then compiling has ended with errors... [Rolling Eyes]
