tree 494b62a20f8e3203a7e1a55be3d68f41eae29306
parent 317ddd256b9c24b0d78fa8018f80f1e495481a10
parent ffa3fd21de8ab0db7962b612d4c6e17c0d88e9c2
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> 1371203538 +0800
committer Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> 1371203538 +0800

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