From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Aug 2015 20:44:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: microblaze-4.7-rc1~1611
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ebcbf1664cda2bb504a3c5c1ced114daf4ddf54b;p=linux-2.6-microblaze.git

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull xen block driver fixes from Jens Axboe:
 "A few small bug fixes for xen-blk{front,back} that have been sitting
  over my vacation"

* 'for-linus' of git://git.kernel.dk/linux-block:
  xen-blkback: replace work_pending with work_busy in purge_persistent_gnt()
  xen-blkfront: don't add indirect pages to list when !feature_persistent
  xen-blkfront: introduce blkfront_gather_backend_features()
---

ebcbf1664cda2bb504a3c5c1ced114daf4ddf54b