Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for...