]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Jul 2015 17:49:11 +0000 (10:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Jul 2015 17:49:11 +0000 (10:49 -0700)
commitdae57fb64ef636a225d3e6c0ddbbc8e32674dd81
tree497c3b943124244dd05c9cde51e3405c1c9b16ea
parentd65b78f5d85b0988b6541f52dadc553f15f51949
parent0f44705175347ec96935d60b765b5d14ecc763bb
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/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