diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 13:55:17 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:24:02 +0200 |
commit | 9fa0f6db3a201bef49f28e69f80802559a38586b (patch) | |
tree | 858548b44a2f218a754b8b0506d1a75c1280732e /drivers/media/common/tuners/Kconfig | |
parent | V4L/DVB (8532): mxl5007t: remove excessive locks (diff) | |
download | linux-9fa0f6db3a201bef49f28e69f80802559a38586b.tar.xz linux-9fa0f6db3a201bef49f28e69f80802559a38586b.zip |
V4L/DVB (8522): videodev2: Fix merge conflict
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/common/tuners/Kconfig')
0 files changed, 0 insertions, 0 deletions