]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Dec 2017 22:53:32 +0000 (14:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Dec 2017 22:53:32 +0000 (14:53 -0800)
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


Trivial merge