Merge branch 'devel-am33xx' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 22 Jun 2012 08:50:49 +0000 (01:50 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 22 Jun 2012 08:50:49 +0000 (01:50 -0700)

Trivial merge