Merge branch 'omap-for-v3.18/fixes-not-urgent' into omap-for-v3.18/intc-v2