]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'v4.11/fixes-non-critical' into v4.11/soc
authorSekhar Nori <nsekhar@ti.com>
Tue, 31 Jan 2017 15:15:32 +0000 (20:45 +0530)
committerSekhar Nori <nsekhar@ti.com>
Tue, 31 Jan 2017 15:15:32 +0000 (20:45 +0530)
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.


Trivial merge