]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a44b91d) | patch
V4L/DVB: af9015: fix bug introduced by commit 490ade7e3f4474f626a8f5d778ead4e599b94fbc
authorAntti Palosaari <crope@iki.fi>
Thu, 9 Sep 2010 15:10:50 +0000 (12:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:05:51 +0000 (01:05 -0200)
commit76391a71543ba0c45e634b31cc33cef1e1be8e79
treead78330baf450c7af3d3a8d0298592dcd72954fctree | snapshot
parenta44b91d9fe02a96b8d53863a1653bd4c14a31ea7commit | diff
V4L/DVB: af9015: fix bug introduced by commit 490ade7e3f4474f626a8f5d778ead4e599b94fbc

Commit 490ade7e3f4474f626a8f5d778ead4e599b94fbc merge conflict fix
leads situation where last nine device definitions were overridden mistakenly.

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