]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd28d5f0fb2715988fbf90c117afc8375b5068b39
tree51da4f1481bbbf9eee6c14ca8fb5c78e3028448e
parent344809b38258f95e7454fb890eefdbec7fba8731
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