From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Wed, 26 Apr 2017 09:59:49 +0000 (+0100)
Subject: Merge branches 'fixes' and 'misc' into for-next
X-Git-Tag: v4.12-rc1~69^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c92a90a5060a84e4a180af6b60aa0fb3a5e46c64;p=linux-block.git

Merge branches 'fixes' and 'misc' into for-next
---

c92a90a5060a84e4a180af6b60aa0fb3a5e46c64