From: Jens Axboe <axboe@fb.com>
Date: Wed, 8 Apr 2015 02:00:45 +0000 (-0600)
Subject: Merge branch 'stable/for-jens-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=976f2ab4985a1dbe3f3f0777ce01d4fdb404c62a;p=linux-beck.git

Merge branch 'stable/for-jens-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-4.1/drivers

Konrad writes:

This pull has one fix and an cleanup.

Note that David Vrabel in the xen/tip.git tree has other changes for the
Xen block drivers that are related to his grant work - and they do not
conflict with this git pull.
---

976f2ab4985a1dbe3f3f0777ce01d4fdb404c62a