| commit | dae57fb64ef636a225d3e6c0ddbbc8e32674dd81 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 18 Jul 2015 17:49:11 +0000 (18 10:49 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 18 Jul 2015 17:49:11 +0000 (18 10:49 -0700) | ||
| tree | 497c3b943124244dd05c9cde51e3405c1c9b16ea | treesnapshot (tar.gz zip) |
| parent | d65b78f5d85b0988b6541f52dadc553f15f51949 | commitdiff |
| parent | 0f44705175347ec96935d60b765b5d14ecc763bb | commitdiff |
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
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