Merge branch 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into...
authorDave Airlie <airlied@redhat.com>
Mon, 4 Aug 2014 23:26:09 +0000 (09:26 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 4 Aug 2014 23:26:09 +0000 (09:26 +1000)
commit920f946428b70494eb1c64e0de260da0d8bde040
treef858df3d40b2ef36b282949b7feaa82cd8b95e8a
parenteceb55a0ecd584ac5bebf667ffd8e859f261d0c0
parentc707c3619ca81f499a5ce032021405e989a96ff0
Merge branch 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next

This builds upon the previous set of fixes which were pulled on 6th July.
Included in this set are:
- an update from Jean-Francois to add the missing reg documentation entry
  to the device tree documentation.
- conversion of the tda998x driver to the component helpers.

* 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  drm/i2c: tda998x: add component support
  drm/i2c: tda998x: allow re-use of tda998x support code
  drm/i2c: tda998x: fix lack of required reg in DT documentation

Conflicts:
drivers/gpu/drm/i2c/tda998x_drv.c
drivers/gpu/drm/i2c/tda998x_drv.c