tree aec5432786f7cb1d5042dbb97a1995109a1ce3e3
parent ca50a5f39041497253c6362f2ba4da1b56d3e6cb
parent 6280f190da4dd083f14f704be6b3314311a7eacb
author Jeremy Fitzhardinge <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