Merge remote-tracking branch 'kvm/next' into kvm-arm-next
authorChristoffer Dall <christoffer.dall@linaro.org>
Fri, 18 Oct 2013 03:40:08 +0000 (20:40 -0700)
committerChristoffer Dall <christoffer.dall@linaro.org>
Fri, 18 Oct 2013 03:40:08 +0000 (20:40 -0700)

Trivial merge