]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
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)
commitb88a10765471cff87025794fbe1ccaa96c7945a8
tree01f69e2fbf6842cece34a47be7574938b87ade48
parent57a66aafda62aacd15f0d1f4f260cc0efdf1d0e4
parent430d7dd448f48f54e79614ca237f44cd543f73da
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.