]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca50a5f 6280f19)
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)
* xen/xenbus:
  implement O_NONBLOCK for /proc/xen/xenbus
  xenbus: do not hold transaction_mutex when returning to userspace

1  2 
drivers/xen/xenbus/xenbus_xs.c patch | diff1 | diff2 | blob | history
drivers/xen/xenfs/xenbus.c patch | diff1 | diff2 | blob | history

diff --cc drivers/xen/xenbus/xenbus_xs.c
Simple merge
diff --cc drivers/xen/xenfs/xenbus.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.