Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Nov 2015 18:26:24 +0000 (10:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Nov 2015 18:26:24 +0000 (10:26 -0800)
commit707b4f493e77638387f29d5ea35e383c418e710d
treedc80dbbc8f52e30803caf023b9d53cb2133b63f3
parent4143fc83bb0c05a4e2042d78e18a75156e914260
parent3da6d49e847128378c30292848125cc3e207e5f7
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "Two timer fixlets from Arnd:

   - Use proper constant size in the FSL timer driver
   - Prevent a build error for legacy platforms"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET
  clocksource/fsl: Avoid harmless 64-bit warnings