diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-22 07:12:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-22 07:12:00 -0300 |
| commit | 8cd12cf4483a6c0b0fd1d221d8c6ebd02236f077 (patch) | |
| tree | 207ec9be4aae5bf5216dcad124e411fbb554231a /linux/drivers/media/common | |
| parent | f1c16914fc0f794e9febebc7a345fd5c86ebdbd4 (diff) | |
| parent | 2e87dc4bc0ada9acabcc0d704444e8f361490624 (diff) | |
| download | mediapointer-dvb-s2-8cd12cf4483a6c0b0fd1d221d8c6ebd02236f077.tar.gz mediapointer-dvb-s2-8cd12cf4483a6c0b0fd1d221d8c6ebd02236f077.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Fixed a small merge conflicts at:
merging linux/drivers/media/video/cx18/cx18-cards.h
warning: conflicts during merge.
merging linux/drivers/media/video/cx18/cx18-cards.h failed!
Basically, two new structures were added bellow the same place
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common')
0 files changed, 0 insertions, 0 deletions