tree 94523043aa33835a1418d04c2adf38129bbb0bcc
parent b7ab524b9340ed3775a53e52987a3d3f1056df7c
parent 390403fd79821bbd0c3a0d83307df2be87047b36
author Tony Lindgren <tony@atomide.com> 1397864678 -0700
committer Tony Lindgren <tony@atomide.com> 1397864678 -0700

Merge branch 'fixes-v3.15-rc1'; commit '390403fd79821bbd0c3a0d83307df2be87047b36' into omap-for-v3.15/fixes