tree b2a44e08e9e683078e9d20d6072a513798788314
parent 4931445b94f49672028b81ace9d4eee8ddf19ab2
parent da1f026b532ce944d74461497dc6d8c16456466e
author Tony Lindgren <tony@atomide.com> 1293046212 -0800
committer Tony Lindgren <tony@atomide.com> 1293046212 -0800

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