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/mtd/maps/omap_nor.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/irda/Kconfig
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/rtc/Makefile
Simple merge

diff --cc drivers/usb/host/Kconfig
Simple merge