diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-12-14 10:31:16 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-12-14 10:31:16 -0500 |
| commit | e4100f4213579abad4a1b3e25a387a78075c9f0b (patch) | |
| tree | 0d26109ab05ae7eb5553203a53b28a36501faf49 /Kbuild | |
| parent | bce71de364494554ee59fb41f633188eb7de1d58 (diff) | |
media: staging: fix a merge conflictold/cs_e4100f421357
Lirc is not at staging anymore.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Kbuild')
0 files changed, 0 insertions, 0 deletions