Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git] / arch / powerpc / kernel / asm-offsets.c
Simple merge