Merge branches 'devel-fixes' and 'devel-mux' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:26:24 +0000 (17:26 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:26:24 +0000 (17:26 -0800)

Trivial merge