patch to 3.1.10-8580daa from HTC

Signed-off-by: David Savage <bedalus@gmail.com>
arm: again spinlock - use from 3.8.2

Signed-off-by: David Savage <bedalus@gmail.com>
minor smartmax fix