| commit | 3d3e66ba2ced6c5ba7d960f106ba2d3a4444c4ab | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 20 12:21:26 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 20 12:21:26 2015 -0700 |
| tree | f4b7f3a7258e26f51f7828d0fb01df0a81f9baff | |
| parent | a971dbcab969be63ca5737821c8cbd6cc26ff9ad [diff] | |
| parent | 87ffd2b9bb74061c120f450e4d0f3409bb603ae0 [diff] |
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