From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Aug 2014 23:26:09 +0000 (+1000)
Subject: Merge branch 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into... 
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=920f946428b70494eb1c64e0de260da0d8bde040;p=pandora-kernel.git

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
---

920f946428b70494eb1c64e0de260da0d8bde040
Reading git-diff-tree failed