Merge branch 'timers-v3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 May 2012 11:04:11 +0000 (12:04 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 May 2012 11:04:11 +0000 (12:04 +0100)

Trivial merge