Merge branch 'omap-for-v3.13/n900' into omap-for-v3.13/board
authorTony Lindgren <tony@atomide.com>
Fri, 11 Oct 2013 23:14:23 +0000 (16:14 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 11 Oct 2013 23:14:23 +0000 (16:14 -0700)

Trivial merge