tree f4b7f3a7258e26f51f7828d0fb01df0a81f9baff
parent a971dbcab969be63ca5737821c8cbd6cc26ff9ad
parent 87ffd2b9bb74061c120f450e4d0f3409bb603ae0
author Linus Torvalds <torvalds@linux-foundation.org> 1440098486 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1440098486 -0700
mergetag object 87ffd2b9bb74061c120f450e4d0f3409bb603ae0
 type commit
 tag for-linus-4.2-rc7-tag
 tagger David Vrabel <david.vrabel@citrix.com> 1440069179 +0100
 
 xen: build fix for 4.2-rc7
 
 - Fix i386 build with an (uncommon) configuration
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJV1bZtAAoJEFxbo/MsZsTR3sYH/2Q+wabqeFZotSZsJjYjSh+q
 6hCRB/tD+LbmReYuFBsqStHUDEL0Ljh9kw6YQvUrEVLv6CIH/pCVhj2U+/INlUur
 aScKQe1ttKaMzEAB2opLQnYMw5Q/C/pHAtq88MYMWnYBb9fM/puMyI0iXu8FhoOP
 +QYdaDt7+hRfID3PWZ7JxLGu+AqVgis5OAh/rt/Y4aC/WaNF7ifrE4qIJlgaR9x4
 IDglRBc4cPhLjwb2yhykiRHREhydVvRqEPsgji20T7pXVduj5DEqqVpU1XMqKBNU
 0EmZ5wLnELvWxPWv3zCScAtvmH30+i4QQcGB/3igJCeYN0gBxzeoGbTKWf4P0HM=
 =lRue
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-4.2-rc7-tag' of git://git.kernel.org/pub/scm/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