From: Jiri Kosina Date: Mon, 1 May 2017 19:49:28 +0000 (+0200) Subject: Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into... X-Git-Tag: MMI-PSA29.97-13-9~5710^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0841609f658c77f066af9c61a2e13143564fcb4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus --- a0841609f658c77f066af9c61a2e13143564fcb4