From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 12 Nov 2010 07:47:04 +0000 (+0100)
Subject: Merge branch 'upstream/blkfront' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~7613^2~3345^2~4
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1ff5125fb85a46279421350eeaf812f728784d35;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream/blkfront' of git://git./linux/kernel/git/jeremy/xen into for-linus

Conflicts:
	drivers/block/xen-blkfront.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

1ff5125fb85a46279421350eeaf812f728784d35