From: Jens Axboe <axboe@fb.com>
Date: Fri, 5 Jun 2015 16:58:28 +0000 (-0600)
Subject: Merge branch 'for-4.2/core' into for-4.2/drivers
X-Git-Tag: firefly_0821_release~176^2~1572^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b281ebb817b009dc586347d7800b80944ba3ec18;p=firefly-linux-kernel-4.4.55.git

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

b281ebb817b009dc586347d7800b80944ba3ec18