From: Sekhar Nori <nsekhar@ti.com>
Date: Tue, 31 Jan 2017 15:15:32 +0000 (+0530)
Subject: Merge branch 'v4.11/fixes-non-critical' into v4.11/soc
X-Git-Tag: v4.11-rc1~90^2^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b88a10765471cff87025794fbe1ccaa96c7945a8;p=linux.git

Merge branch 'v4.11/fixes-non-critical' into v4.11/soc

This merge is because patches in branch v4.11/soc conflict
with cleanup done as part of 0a5011673af0 ("ARM: davinci:
da850: coding style fix") that is already queued as a
non-critical fix.
---

b88a10765471cff87025794fbe1ccaa96c7945a8