Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Apr 2007 16:49:59 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Apr 2007 16:49:59 +0000 (09:49 -0700)
commit895e1fc7226e6732bc77138955b6c7dfa279f57a
tree61b1ec5d4d328c8e657ca25b19fa8f3cd899e6cb
parentac57b3a9ce280763296f99e32187a0b4384d9389
parent6b8d0f9b180cb93513bb65f705b299370f0357a1
Merge branch 'linus' of git://git./linux/kernel/git/avi/kvm

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: Fix off-by-one when writing to a nonpae guest pde