Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream