aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-05-01 21:49:28 +0200
committerJiri Kosina <jkosina@suse.cz>2017-05-01 21:49:28 +0200
commita0841609f658c77f066af9c61a2e13143564fcb4 (patch)
tree0f0df468b6f852501cd4ed1570701e695b9f5d56 /drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
parentlivepatch: add missing printk newlines (diff)
parentlivepatch: Cancel transition a safe way for immediate patches (diff)
downloadlinux-dev-a0841609f658c77f066af9c61a2e13143564fcb4.tar.xz
linux-dev-a0841609f658c77f066af9c61a2e13143564fcb4.zip
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c')
0 files changed, 0 insertions, 0 deletions