Merge branch 'devel-am33xx-data' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 10 Jul 2012 07:42:58 +0000 (00:42 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 10 Jul 2012 07:42:58 +0000 (00:42 -0700)

Trivial merge