]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
authorThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:34:12 +0000 (13:34 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:34:12 +0000 (13:34 +0200)
1  2 
arch/arm/include/asm/pgtable-3level.h

Simple merge