Merge AT91, EP93xx, General devel, PXA, S3C, V6+ and Xscale trees