Merge branches 'devel-fixes' and 'devel-board' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 2 Feb 2011 01:14:50 +0000 (17:14 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 2 Feb 2011 01:14:50 +0000 (17:14 -0800)

Trivial merge