Merge branch 'timers-core-for-linus' of https://git.kernel.org/cgit/linux/kernel...
authorChris Zankel <chris@zankel.net>
Mon, 8 Jul 2013 08:10:26 +0000 (01:10 -0700)
committerChris Zankel <chris@zankel.net>
Mon, 8 Jul 2013 08:10:26 +0000 (01:10 -0700)

Trivial merge