diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-06 14:53:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-06 14:53:32 -0800 |
commit | 07eca14b6fdd0ccc52ed9127aa6924507261a907 (patch) | |
tree | 0e9312865bca9ca3b53f10eeb43e316454e22c81 /include | |
parent | e56d565d67ae7dd6b25ce6a331c43e691ff1d247 (diff) | |
parent | 14c47b54b0d9389e3ca0718e805cdd90c5a4303a (diff) |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar:
"Two fixes:
- objtool cross-build fixes
- removal of an obsolete CPU-hotplug state name from comments"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Fix 64-bit build on 32-bit host
cpu/hotplug: Fix state name in takedown_cpu() comment
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions