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 arch/arm/vfp/vfp.h
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc include/linux/i2c-id.h
Simple merge

diff --cc kernel/printk.c
Simple merge