Merge branch 'master' into devel

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/arm/kernel/signal.c
Simple merge

diff --cc arch/arm/mach-ep93xx/include/mach/ts72xx.h
Simple merge

diff --cc arch/arm/mach-ep93xx/ts72xx.c
Simple merge

diff --cc arch/arm/mach-mx3/mx31moboard-devboard.c
Simple merge

diff --cc arch/arm/mach-mx3/mx31moboard-marxbot.c
Simple merge

diff --cc arch/arm/mach-mx3/mx31moboard.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/plat-omap/gpio.c
Simple merge

diff --cc arch/arm/plat-s3c/pwm.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge