From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Apr 2015 20:19:59 +0000 (-0700)
Subject: Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-5.0.0-8.9~9638
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5945fba8c596546a075382c42cf35141d1ae6eca;p=mirror_ubuntu-disco-kernel.git

Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 build changes from Ingo Molnar:
 "Small cleanups and fixes"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text
  x86/build/defconfig: Enable USB_EHCI_TT_NEWSCHED=y
  x86/build: Fix mkcapflags.sh bash-ism
  x86/Kconfig: Simplify X86_UP_APIC handling
  x86/Kconfig: Simplify X86_IO_APIC dependencies
  x86/Kconfig: Avoid issuing pointless turned off entries to .config
---

5945fba8c596546a075382c42cf35141d1ae6eca