Merge branch 'for-next' linux-omap origin/linux-omap
authorTony Lindgren <tony@atomide.com>
Fri, 16 Oct 2015 20:42:34 +0000 (13:42 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Oct 2015 20:42:34 +0000 (13:42 -0700)

Trivial merge