Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal
authorTony Lindgren <tony@atomide.com>
Mon, 25 Nov 2013 23:30:10 +0000 (15:30 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 25 Nov 2013 23:30:10 +0000 (15:30 -0800)

Trivial merge