Merge branch 'devel-am33xx-part2' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 4 Jul 2012 07:53:31 +0000 (00:53 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Jul 2012 07:53:31 +0000 (00:53 -0700)

Trivial merge