Merge branches 'devel-hwspinlock' and 'devel-mcspi' into omap-for-linus