diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 06:07:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 06:07:41 -0300 |
| commit | 664716ad013fceaa9e554100a42f99a460de3440 (patch) | |
| tree | 9a2753e12d7891bf30d2e4dce0621385edef3830 /scripts | |
| parent | [media] media-device.h: fix compiler warning (diff) | |
| parent | [media] media.h: use hex values for range offsets, move connectors base up. (diff) | |
| download | linux-664716ad013fceaa9e554100a42f99a460de3440.tar.gz linux-664716ad013fceaa9e554100a42f99a460de3440.zip | |
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 'scripts')
0 files changed, 0 insertions, 0 deletions