Merge branches 'devel-fixes' and 'devel-cleanup' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 27 Apr 2011 13:19:14 +0000 (06:19 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Apr 2011 13:19:14 +0000 (06:19 -0700)

Trivial merge