Merge branch '3.17/hdmi-infoframe' into for-next
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 4 Aug 2014 06:50:07 +0000 (09:50 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 4 Aug 2014 06:50:07 +0000 (09:50 +0300)

Trivial merge