Sherry pick : Bug fix

Hi Mardon,
I cherry pick those commit from a 3.x kernel for galaxy S but they seems to apply for us too.
Its my very first experience with Git and I do not have particular programming skill.
Lets me know if I do something wrong.
Thanks