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)
commit51dc2a73bc5504e47807ae6c022e77246f9fe8a9
tree696ceccc14335343136770d9abcd58bab1c160f7
parent5d73bf8774f0719de5540b41f4754acdc693d98f
parentfcd1e713adff6ecf6cc4d0dac10a85c9800e502b
Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-du-to-v3.18-rc1' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

Conflicts:
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c