Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/mtd/onenand/omap2.c

diff --cc Makefile
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge