Merge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm/linux...