Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into for...
authorTony Lindgren <tony@atomide.com>
Thu, 25 Nov 2010 01:15:02 +0000 (17:15 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Nov 2010 01:15:02 +0000 (17:15 -0800)

Trivial merge