summaryrefslogtreecommitdiff
path: root/linux/drivers/media/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-26 18:28:55 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-08-26 18:28:55 -0300
commitb98fedbf223090872b1b4b7ec8e89994b55fb9bb (patch)
treeed2c0aa6bd8697123815b41844f993c01cb85ba4 /linux/drivers/media/Kconfig
parent1af587a5d42154a22a337a6e0d478835d12ac302 (diff)
downloadmediapointer-dvb-s2-b98fedbf223090872b1b4b7ec8e89994b55fb9bb.tar.gz
mediapointer-dvb-s2-b98fedbf223090872b1b4b7ec8e89994b55fb9bb.tar.bz2
Fix a merge trouble
From: Mauro Carvalho Chehab <mchehab@redhat.com> Unfortunately, mailimport added the new files at the wrong place. Fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/Kconfig')
0 files changed, 0 insertions, 0 deletions