diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 12:07:04 +0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 12:07:41 +0300 |
commit | 664716ad013fceaa9e554100a42f99a460de3440 (patch) | |
tree | 9a2753e12d7891bf30d2e4dce0621385edef3830 /drivers/media/dvb-frontends/hd29l2.c | |
parent | 697fe725f37aaa5fb15f581bc6e5b588f5fc8f7b (diff) | |
parent | 58402b6e98f9059420e64b296db6c4cb6f6c1117 (diff) | |
download | linux-664716ad013fceaa9e554100a42f99a460de3440.tar.xz |
Merge branch 'v4l_for_linus' into patchwork
We need to import the changes at media.h, as we have a
followup patch that depends on it.
* v4l_for_linus:
[media] media.h: use hex values for range offsets, move connectors base up.
[media] adv7604: fix tx 5v detect regression
Diffstat (limited to 'drivers/media/dvb-frontends/hd29l2.c')
0 files changed, 0 insertions, 0 deletions