Merge branch 'master' of git://git.sv.gnu.org/qemu
commit1b18bb9da53e964245901171200dceaefdecedc5
authorMark McLoughlin <markmc@redhat.com>
Thu, 11 Jun 2009 09:33:12 +0000 (11 10:33 +0100)
committerMark McLoughlin <markmc@redhat.com>
Thu, 11 Jun 2009 09:33:12 +0000 (11 10:33 +0100)
tree083e6f71f0633618c102e95f6d67172d85c17bef
parentac20d44b2e58195217467d1ed693022600000bee
parent168ccc11c323af885de353d9e045c0c1f78f6f2f
Merge branch 'master' of git://git.sv.gnu.org/qemu

* 'master' of git://git.sv.gnu.org/qemu: (1 commit)
  kvm: Improve upgrade notes when facing unsupported kernels

Conflicts:
configure

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
configure