tree 39fa8ddb5163661361dbc5b2ab11f4e331492ead
parent 17fe12c5a7bd674c1e6dca9cf1e250f9cd7b96b1
parent 02b7b94ee98a0a463195d148e5c5885a218ee16f
author Tony Lindgren <tony@atomide.com> 1300126942 -0700
committer Tony Lindgren <tony@atomide.com> 1300126942 -0700

Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus