Merge branch 'origin' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 24 Sep 2009 20:22:33 +0000 (21:22 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 24 Sep 2009 20:22:33 +0000 (21:22 +0100)
commitbaea7b946f00a291b166ccae7fcfed6c01530cc6
tree4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af
parentae19ffbadc1b2100285a5b5b3d0a4e0a11390904
parent94e0fb086fc5663c38bbc0fe86d698be8314f82f
Merge branch 'origin' into for-linus

Conflicts:
MAINTAINERS
MAINTAINERS
arch/arm/kernel/Makefile
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-sam9rlek.c
arch/arm/mm/init.c
drivers/i2c/busses/Kconfig
drivers/serial/pxa.c
drivers/spi/pxa2xx_spi.c
drivers/usb/host/ohci-pxa27x.c