summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-mc.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-09 10:43:49 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-09 10:43:49 +0200
commit52e31f89cc40c613b22e62108fe12b27433a888e (patch)
treec3cd45d6950706c32efdd341715e70b6ee6d7a5e /include/media/v4l2-mc.h
parent9a7e7b571826c4399aa639af4a670642d96d935c (diff)
parentee40fb2948fc99096836995d4f3ddcc0efbac790 (diff)
downloadblackbird-op-linux-52e31f89cc40c613b22e62108fe12b27433a888e.tar.gz
blackbird-op-linux-52e31f89cc40c613b22e62108fe12b27433a888e.zip
Merge branch 'linus' into x86/asm, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/media/v4l2-mc.h')
-rw-r--r--include/media/v4l2-mc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 98a938aabdfb..7a8d6037a4bb 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -1,7 +1,7 @@
/*
* v4l2-mc.h - Media Controller V4L2 types and prototypes
*
- * Copyright (C) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+ * Copyright (C) 2016 Mauro Carvalho Chehab <mchehab@kernel.org>
* Copyright (C) 2006-2010 Nokia Corporation
* Copyright (c) 2016 Intel Corporation.
*
OpenPOWER on IntegriCloud