projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 697fe72 58402b6)
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)
commit664716ad013fceaa9e554100a42f99a460de3440
tree9a2753e12d7891bf30d2e4dce0621385edef3830tree | snapshot (tar.gz zip)
parent697fe725f37aaa5fb15f581bc6e5b588f5fc8f7bcommit | diff
parent58402b6e98f9059420e64b296db6c4cb6f6c1117commit | diff
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 diff1 | diff2 | blob | history
include/uapi/linux/media.h diff1 | diff2 | blob | history