projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 74b9ef2) | patch
V4L/DVB (8522): videodev2: Fix merge conflict
authorMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 11:55:17 +0000 (08:55 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 15:24:02 +0000 (12:24 -0300)
commit9fa0f6db3a201bef49f28e69f80802559a38586b
tree858548b44a2f218a754b8b0506d1a75c1280732etree | snapshot
parent74b9ef21162fd81d9de87319c4373f523e2869cdcommit | diff
V4L/DVB (8522): videodev2: Fix merge conflict

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
include/linux/videodev2.h diff | blob | blame | history
Making Linux better for my computers