Merge branch 'ib-5.8-jz47xx-ts' into HEAD
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 22 Jul 2020 13:36:31 +0000 (14:36 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 22 Jul 2020 13:36:31 +0000 (14:36 +0100)
commitd0d7c5845e7faef263184c68f8a31634dfa22c6f
tree1ee3f612d13b491b327c419dec7f91d5302ab127
parent8525df47b3d1eaa9a2206964f63f71a2f48dc7c1
parentb96952f498db61cdce60f3161a445442d1cc08bc
Merge branch 'ib-5.8-jz47xx-ts' into HEAD
Immutable branch may be needed in input for a joystick set that is
dependent on it.
drivers/iio/adc/Kconfig
drivers/iio/adc/ingenic-adc.c