Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-du-to-v3.18-rc1' into backport/v3.14.24...
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:58:56 +0000 (10:58 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:58:56 +0000 (10:58 +0900)
Conflicts:
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c


Trivial merge