Merge branches 'fixes', 'testing-misc', 'devel-am33xx' and 'dt'
authorTony Lindgren <tony@atomide.com>
Tue, 5 Jun 2012 11:30:00 +0000 (04:30 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Jun 2012 11:30:00 +0000 (04:30 -0700)

Trivial merge