Merge branch 'devel-am33xx-data' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 9 Jul 2012 12:38:13 +0000 (05:38 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Jul 2012 12:38:13 +0000 (05:38 -0700)

Trivial merge