Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 10 Jun 2014 15:04:12 +0000 (16:04 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 10 Jun 2014 15:04:12 +0000 (16:04 +0100)
commit91212466097ca12eeae078db70823f8717c9b534
tree90c3739b0b5c021616f38847f29032bc2b794290
parent7528dcd02de1fa72acbc841a3608046549a163a2
parent18e762ac4dfa4b2c19a5191bc6de4fcaffd44ba1
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging