]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 26b9d6c) | patch
V4L/DVB (13271a): Fix a badly solved merge conflict
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 4 Nov 2009 14:11:43 +0000 (12:11 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 5 Dec 2009 20:41:11 +0000 (18:41 -0200)
commit648732fcefa73932ae8caa8bcfd262863904dd66
tree51da4f1481bbbf9eee6c14ca8fb5c78e3028448etree | snapshot
parent26b9d6c0b0e91c84b4713da5abd16baef3963d33commit | diff
V4L/DVB (13271a): Fix a badly solved merge conflict

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dvb-usb/dib0700_devices.c diff | blob | history
Beck SC1x5 Kernel