Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Jan 2013 03:14:22 +0000 (19:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Jan 2013 03:14:22 +0000 (19:14 -0800)
Pull kvm fixlet from Marcelo Tosatti.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PPC: Emulate dcbf


Trivial merge