Merge (part of) tag 'omap-for-v3.19/hwmod-and-defconfig' of git://git.kernel.org...