diff options
| author | David S. Miller <[email protected]> | 2016-06-30 05:03:36 -0400 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-06-30 05:03:36 -0400 |
| commit | ee58b57100ca953da7320c285315a95db2f7053d (patch) | |
| tree | 77b815a31240adc4d6326346908137fc6c2c3a96 /include/media/v4l2-mc.h | |
| parent | 6f30e8b022c8e3a722928ddb1a2ae0be852fcc0e (diff) | |
| parent | e7bdea7750eb2a64aea4a08fa5c0a31719c8155d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'include/media/v4l2-mc.h')
| -rw-r--r-- | include/media/v4l2-mc.h | 2 |
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 <[email protected]> + * Copyright (C) 2016 Mauro Carvalho Chehab <[email protected]> * Copyright (C) 2006-2010 Nokia Corporation * Copyright (c) 2016 Intel Corporation. * |