[Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging

[patchbot@xxxxxxx]

commit aaa3b94abc256729091b9d5c575439e48e951ba7
Merge: 0c64527e7fc961372a398eb68e307c2b103f1a28 
5225a95577f71be633e490b729b2e157d4fa3208
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Tue Nov 19 16:41:28 2013 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Nov 19 16:41:28 2013 +0000

    Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into 
staging

 xen/arch/x86/x86_emulate/x86_emulate.c |    7 +-
 xen/common/sched_arinc653.c            |   96 +++++++++++++++++--------------
 2 files changed, 56 insertions(+), 47 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