From: Jens Axboe <axboe@fb.com>
Date: Thu, 11 Sep 2014 15:31:18 +0000 (-0600)
Subject: Merge branch 'for-linus' into for-3.18/core
X-Git-Tag: fixes-against-v3.18-rc2~51^2~49
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b207892b061da7608878e273ae22ba9bf9be264b;p=pandora-kernel.git

Merge branch 'for-linus' into for-3.18/core

A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.

Signed-off-by: Jens Axboe <axboe@fb.com>

Conflicts:
	block/scsi_ioctl.c
---

b207892b061da7608878e273ae22ba9bf9be264b
Reading git-diff-tree failed