Merge branch 'linus' into x86/cleanups

Pull in upstream changes so we can apply depending patches.
This commit is contained in:
Thomas Gleixner
2015-12-19 11:49:13 +01:00
9086 changed files with 444141 additions and 223779 deletions

View File

@@ -1,7 +1,6 @@
#ifndef _ASM_X86_PLATFORM_H
#define _ASM_X86_PLATFORM_H
#include <asm/pgtable_types.h>
#include <asm/bootparam.h>
struct mpc_bus;