x86: trivial header merges
Brian Gerst authored

Merge 32/64-bit headers that simply redirect to asm-generic

[tglx: fixup Kbuild as well]
Signed-off-by: default avatarBrian Gerst <bgerst@didntduck.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
020bd9f1