Merge branches 'devel-fixes' and 'devel-cleanup' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 3 May 2011 10:34:21 +0000 (03:34 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 May 2011 10:34:21 +0000 (03:34 -0700)

Trivial merge