Merge branches 'devel-fixes' and 'devel-cleanup' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 20 Apr 2011 15:57:25 +0000 (08:57 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Apr 2011 15:57:25 +0000 (08:57 -0700)

Trivial merge