Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/mach-omap2/clock.c
	arch/arm/mach-omap2/clock34xx.h
	arch/arm/plat-omap/dma.c

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

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

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

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge