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)
commit05f689400ea5fa3d71af82f910c8b140f87ad1f3
tree39fa8ddb5163661361dbc5b2ab11f4e331492ead
parent17fe12c5a7bd674c1e6dca9cf1e250f9cd7b96b1
parent02b7b94ee98a0a463195d148e5c5885a218ee16f
Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus