rdinge <jeremy.fitzhardinge@citrix.com> 1280958564 -0700
committer Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> 1280958564 -0700

Merge branch 'xen/xenbus' into upstream/xen

* xen/xenbus:
  implement O_NONBLOCK for /proc/xen/xenbus
  xenbus: do not hold transaction_mutex when returning to userspace
¿±š