diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-18 20:49:11 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-18 20:49:11 +0300 |
commit | dae57fb64ef636a225d3e6c0ddbbc8e32674dd81 (patch) | |
tree | 497c3b943124244dd05c9cde51e3405c1c9b16ea /drivers/infiniband/hw/ehca | |
parent | d65b78f5d85b0988b6541f52dadc553f15f51949 (diff) | |
parent | 0f44705175347ec96935d60b765b5d14ecc763bb (diff) | |
download | linux-dae57fb64ef636a225d3e6c0ddbbc8e32674dd81.tar.xz |
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
Diffstat (limited to 'drivers/infiniband/hw/ehca')
0 files changed, 0 insertions, 0 deletions