Merge branches 'devel-fixes' and 'devel-cleanup' into for-next
authorTony Lindgren <tony@atomide.com>
Fri, 13 May 2011 14:20:17 +0000 (07:20 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 13 May 2011 14:20:17 +0000 (07:20 -0700)

Trivial merge