From: Tony Lindgren <tony@atomide.com>
Date: Wed, 22 Dec 2010 19:30:12 +0000 (-0800)
Subject: Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
X-Git-Tag: v2.6.38-rc1~469^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c10abbb26513f4ccff89c4d80912cb4d36fcd3e8;p=users%2Fwilly%2Flinux.git

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

c10abbb26513f4ccff89c4d80912cb4d36fcd3e8