Merge branch 'timers/locking'
authorIngo Molnar <mingo@elte.hu>
Sun, 6 Feb 2011 11:59:22 +0000 (12:59 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 6 Feb 2011 11:59:38 +0000 (12:59 +0100)

Trivial merge