Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/compressed/Makefile
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/Makefile
Simple merge

diff --cc kernel/printk.c
Simple merge