I usually post long responses -- but I'll keep this short and simple.
No. I don't believe that God has a free-will.
If indeed he already knows the future, then it seems to me that he also already knows what he will do in the future too.
In saying this I admit it may yet be found that God is above these logical "time-space" contraints, that his timeless omnipresence somehow enables him to step outside his own future choices -- somehow embodying all possibilities at once and that he himself is the locus of all that could ever be -- but this seems to lead to a very complicated mess.
I guess I think of the old question, "Can God make a stone so heavy he can't lift it?" Like the question of God having a free-will, my simple answer is no.
I don't believe that God can outdo himself -- he is the very definition is his own limitations.
Hope that answer was short enough.