Merge branch 'v4l_for_linus' into patchwork

Browse source

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

...

This commit is contained in:

Mauro Carvalho Chehab 2016-03-03 06:07:04 -03:00

parent 697fe725f3 58402b6e98

commit 664716ad01

2 changed files with 11 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

include/uapi/linux/media.h

View file