From: Jens Axboe <axboe@fb.com>
Date: Tue, 12 Apr 2016 21:46:35 +0000 (-0600)
Subject: Merge branch 'for-4.7/core' into for-4.7/drivers
X-Git-Tag: v4.7-rc1~156^2~65
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=2f9a0b33ac6c4a2accaf787456080af35f1cab0b

Merge branch 'for-4.7/core' into for-4.7/drivers
---

2f9a0b33ac6c4a2accaf787456080af35f1cab0b