Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 17 Jun 2014 09:40:39 +0000 (10:40 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 17 Jun 2014 09:40:39 +0000 (10:40 +0100)
commit5157e9dfd52682a7376c0c6a9c13ea413c06047e
tree94cbbb38969194413806b30425da7fa431eac44b
parent364c9ee0076d66498c1ae2b2c65833cbe433ceba
parent6e4ecc6d5884b816ed6eb1949561fdfb85acd179
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging