[Xen-changelog] [xen master] Merge branch 'docs.v3' of git://xenbits.xen.org/people/konradwilk/xen into staging

[patchbot@xxxxxxx]

commit 9726b513b8d5fc11f30d3f40df58b342443e4cf4
Merge: 650354dbc2626b643c12873275ca67782f1382c8 
b3138fd1120da98e5dc4a942fc25da50eca787a7
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Thu Mar 28 15:59:21 2013 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Thu Mar 28 15:59:21 2013 +0000

    Merge branch 'docs.v3' of git://xenbits.xen.org/people/konradwilk/xen into 
staging

 xen/include/public/elfnote.h    |    8 ++++++++
 xen/include/public/features.h   |   14 ++++++++++++++
 xen/include/public/io/xs_wire.h |    5 ++++-
 xen/include/public/xen.h        |   22 ++++++++++++++++++++--
 4 files changed, 46 insertions(+), 3 deletions(-)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog