Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git] / arch / x86 / include / asm / hypervisor.h
Simple merge