diff options
| author | Chris Metcalf | 2010-06-05 16:35:29 +0200 |
|---|---|---|
| committer | Chris Metcalf | 2010-06-05 16:35:29 +0200 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /drivers/media/video/cx23885/cx23885-ioctl.h | |
| parent | arch/tile: Do not use GFP_KERNEL for dma_alloc_coherent(). (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | kernel-qcow2-linux-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.tar.gz kernel-qcow2-linux-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.tar.xz kernel-qcow2-linux-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-ioctl.h')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-ioctl.h b/drivers/media/video/cx23885/cx23885-ioctl.h index 80b0f4923c6a..315be0ca5a04 100644 --- a/drivers/media/video/cx23885/cx23885-ioctl.h +++ b/drivers/media/video/cx23885/cx23885-ioctl.h @@ -3,7 +3,7 @@ * * Various common ioctl() support functions * - * Copyright (c) 2009 Andy Walls <awalls@radix.net> + * Copyright (c) 2009 Andy Walls <awalls@md.metrocast.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |