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