tree fa3a3a637be8ddcc371fde1d65b961f4103bfd9f
parent 8a999410135602d98bd007e835dc21c0c279ad72
author Thomas Gleixner <tglx@linutronix.de> 1201696236 +0100
committer Ingo Molnar <mingo@elte.hu> 1201696236 +0100

x86: merge acpi_32/64.h

Merge the files.

[ mingo@elte.hu: build fix ]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>