Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel