timer driver work
Merge branch 'gs'