| commit | 7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1 | [log] [tgz] |
|---|---|---|
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | Wed Aug 04 14:49:24 2010 -0700 |
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | Wed Aug 04 14:49:24 2010 -0700 |
| tree | aec5432786f7cb1d5042dbb97a1995109a1ce3e3 | |
| parent | ca50a5f39041497253c6362f2ba4da1b56d3e6cb [diff] | |
| parent | 6280f190da4dd083f14f704be6b3314311a7eacb [diff] |
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