Merge branch 'devel-am33xx' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 16:18:42 +0000 (09:18 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 16:18:42 +0000 (09:18 -0700)

Trivial merge