Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Mon, 14 Mar 2011 18:22:22 +0000 (11:22 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 14 Mar 2011 18:22:22 +0000 (11:22 -0700)

Trivial merge