19bf7f8ac3
Merge reason: development work has dependency on kvm patches merged upstream. Conflicts: arch/powerpc/include/asm/Kbuild arch/powerpc/include/asm/kvm_para.h Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> |
||
---|---|---|
.. | ||
appldata | ||
boot | ||
crypto | ||
hypfs | ||
include | ||
kernel | ||
kvm | ||
lib | ||
math-emu | ||
mm | ||
net | ||
oprofile | ||
defconfig | ||
Kbuild | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |