Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip...
authorTejun Heo <tj@kernel.org>
Tue, 21 Aug 2012 19:31:12 +0000 (12:31 -0700)
committerTejun Heo <tj@kernel.org>
Tue, 21 Aug 2012 19:31:12 +0000 (12:31 -0700)

Trivial merge