Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/media/radio/Kconfig
Simple merge

diff --cc drivers/media/video/Kconfig
Simple merge

diff --cc drivers/media/video/Makefile
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge