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)
* '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


Trivial merge