]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'v4l_for_linus' into patchwork
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 3 Mar 2016 09:07:04 +0000 (06:07 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 3 Mar 2016 09:07:41 +0000 (06:07 -0300)
commitcaeaf28e686024c383a24241c9a4e6c7a76d0b42
tree9a2753e12d7891bf30d2e4dce0621385edef3830
parent917fab54940537e55d4d33f67302104b0081c97e
parent61fda2bc7e8d9937f25be84c6fc37fbe0be86db0
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
drivers/media/i2c/adv7604.c
include/uapi/linux/media.h