Merge branch 'master' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Sep 2009 11:04:37 +0000 (12:04 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Sep 2009 11:04:37 +0000 (12:04 +0100)
commit87d721ad7a37b7650dd710c88dd5c6a5bf9fe996
tree869d633803eb7c429624d3bd16a6117816849763
parentddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3
parentb7cfda9fc3d7aa60cffab5367f2a72a4a70060cd
Merge branch 'master' into devel
14 files changed:
MAINTAINERS
arch/arm/include/asm/memory.h
arch/arm/kernel/entry-common.S
arch/arm/kernel/signal.c
arch/arm/mach-ep93xx/include/mach/ts72xx.h
arch/arm/mach-ep93xx/ts72xx.c
arch/arm/mach-mx3/mx31moboard-devboard.c
arch/arm/mach-mx3/mx31moboard-marxbot.c
arch/arm/mach-mx3/mx31moboard.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/plat-omap/gpio.c
arch/arm/plat-s3c/pwm.c
drivers/net/Kconfig
drivers/serial/Kconfig