Merge branches 'devel-fixes' and 'devel-cleanup' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 11 May 2011 17:49:00 +0000 (10:49 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 11 May 2011 17:49:00 +0000 (10:49 -0700)

Trivial merge