From: Jens Axboe <axboe@fb.com>
Date: Wed, 1 Oct 2014 20:37:25 +0000 (-0600)
Subject: Merge branch 'stable/for-jens-3.18' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7b7b7f7e024460cb7d77f8f96b6eb1a8803f94d9;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'stable/for-jens-3.18' of git://git./linux/kernel/git/konrad/xen into for-3.18/drivers

Konrad writes:

This pull has two fixes and one cleanup. Nothing earthshattering.
---

7b7b7f7e024460cb7d77f8f96b6eb1a8803f94d9