]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'master' of /home/penberg/kvm into kvm/core
authorPekka Enberg <penberg@kernel.org>
Tue, 11 Jan 2011 14:49:41 +0000 (16:49 +0200)
committerPekka Enberg <penberg@kernel.org>
Tue, 11 Jan 2011 14:49:41 +0000 (16:49 +0200)

Trivial merge