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

[tglx: fixup Kbuild as well]
Signed-off-by: NBrian Gerst <bgerst@didntduck.org>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>