From: Jeremy Fitzhardinge Date: Wed, 4 Aug 2010 21:49:24 +0000 (-0700) Subject: Merge branch 'xen/xenbus' into upstream/xen X-Git-Tag: v2.6.36-rc1~551^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1;p=karo-tx-linux.git 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 --- 7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1