From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Jul 2015 17:49:11 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.2-rc3~7
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=dae57fb64ef636a225d3e6c0ddbbc8e32674dd81;p=sfrench%2Fcifs-2.6.git

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

Pull timer fix from Ingo Molnar:
 "Fix for a misplaced export that can cause build failures in certain
  (rare) Kconfig situations"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick: Move the export of tick_broadcast_oneshot_control to the proper place
---

dae57fb64ef636a225d3e6c0ddbbc8e32674dd81