Merge branch 'am33xx' into omap-for-v3.11/cleanup
authorTony Lindgren <tony@atomide.com>
Fri, 7 Jun 2013 16:12:25 +0000 (09:12 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 7 Jun 2013 16:12:25 +0000 (09:12 -0700)

Trivial merge