Merge branch 'xen/xenbus' into upstream/xen
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Wed, 4 Aug 2010 21:49:24 +0000 (14:49 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Wed, 4 Aug 2010 21:49:24 +0000 (14:49 -0700)
commit7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1
treeaec5432786f7cb1d5042dbb97a1995109a1ce3e3
parentca50a5f39041497253c6362f2ba4da1b56d3e6cb
parent6280f190da4dd083f14f704be6b3314311a7eacb
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
drivers/xen/xenbus/xenbus_xs.c
drivers/xen/xenfs/xenbus.c