From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Aug 2015 19:21:26 +0000 (-0700)
Subject: Merge tag 'for-linus-4.2-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3d3e66ba2ced6c5ba7d960f106ba2d3a4444c4ab;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'for-linus-4.2-rc7-tag' of git://git./linux/kernel/git/xen/tip

Pull xen build fix from David Vrabel:
 "Fix i386 build with an (uncommon) configuration"

* tag 'for-linus-4.2-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC
---

3d3e66ba2ced6c5ba7d960f106ba2d3a4444c4ab