Merge branches 'devel-fixes' and 'devel-cleanup' into for-next
authorTony Lindgren <tony@atomide.com>
Mon, 9 May 2011 15:15:39 +0000 (08:15 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 9 May 2011 15:15:39 +0000 (08:15 -0700)

Trivial merge