]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c401eea) | patch
[media] v4l2-ctrls: Fix a merge conflict
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 10 Jul 2011 19:34:48 +0000 (16:34 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 10 Jul 2011 19:37:39 +0000 (16:37 -0300)
commit941fd765e886f8aca3d2e0b02669d6063c572322
tree50f2730fea87f7044cee2b1f6594b02563ab3a94tree | snapshot
parentc401eea83fa76aab8ec14e8310199838e424dcb6commit | diff
[media] v4l2-ctrls: Fix a merge conflict

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/v4l2-ctrls.c diff | blob | history
Linux kernel for KaRo TX COM modules