Merge branch 'pxa/devel' into next/devel2
authorArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 19:59:09 +0000 (20:59 +0100)
committerArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 19:59:09 +0000 (20:59 +0100)
commitb8bc83971cc20cae3c3b65c26a804f350d74960c
tree2573e6367e1806c298344fa023bb49a16cc4d1e4
parent11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05
parentbca7ab316edd819edd0e3d59f9ccb26c6b2173f5
Merge branch 'pxa/devel' into next/devel2

Conflicts:
arch/arm/mach-s3c2416/s3c2416.c
arch/arm/Kconfig
arch/arm/mach-s3c2410/s3c2410.c
arch/arm/mach-s3c2416/s3c2416.c
arch/arm/mach-s3c2440/s3c2440.c
arch/arm/mach-s3c2440/s3c2442.c
arch/arm/plat-s5p/irq-gpioint.c