Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into for...
authorTony Lindgren <tony@atomide.com>
Tue, 16 Nov 2010 21:40:44 +0000 (13:40 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 16 Nov 2010 21:40:44 +0000 (13:40 -0800)

Trivial merge