]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:16:01 +0000 (14:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:16:01 +0000 (14:16 +1000)
commit172b680e84524376602d8a5ab73f87791a090e92
treeb40748c2bea93b8539df8f0e5c5395c1862b429a
parent3cf6ab17fc9671a2874dc097b517215e6913e036
parentb6ddf05ff68d81a7c1736717faf492b70e9bf4f9
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
arch/powerpc/include/asm/reg_booke.h
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/x86.c