]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'kvm/gitish' into kvm/core
authorPekka Enberg <penberg@kernel.org>
Fri, 8 Apr 2011 16:57:11 +0000 (19:57 +0300)
committerPekka Enberg <penberg@kernel.org>
Fri, 8 Apr 2011 16:57:11 +0000 (19:57 +0300)
commit6d7fe947419eb240a3b469d1b4ab306234d27b43
tree4e0c02ede67a5c00e338cb75f7c54d0f84588273
parentda9ad65a982cb62a2d1eb2838cec56b83cd18978
parentff56002fb484e4dca6c7561d639fcc8a5fd0ad07
Merge branch 'kvm/gitish' into kvm/core

Conflicts:
tools/kvm/Makefile
tools/kvm/main.c
tools/kvm/Makefile
tools/kvm/kvm-run.c