Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
"A single fix to unbreak a clocksource driver which has more than 32bit
counter width"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: Mmio: remove artificial 32bit limitation

Changed files
+1 -1
drivers
clocksource
+1 -1
drivers/clocksource/mmio.c
··· 55 55 { 56 56 struct clocksource_mmio *cs; 57 57 58 - if (bits > 32 || bits < 16) 58 + if (bits > 64 || bits < 16) 59 59 return -EINVAL; 60 60 61 61 cs = kzalloc(sizeof(struct clocksource_mmio), GFP_KERNEL);