Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
[pandora-kernel.git] / virt / kvm / ioapic.c
Simple merge