Merge branches 'devel-mux' and 'devel-misc' into for-next
authorTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 20:51:48 +0000 (12:51 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 20:51:48 +0000 (12:51 -0800)

Trivial merge