Merge branch 'next-s5p' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:34:55 +0000 (21:34 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:34:55 +0000 (21:34 +0900)
commitf2b7e3c54a304677a1142829fb5913595885379f
tree1eb941524c7325672f947dab525d96228b362e20
parent6b8eda04ffdc24b68d379a32358f4f09a425a380
parent0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1
Merge branch 'next-s5p' into for-next

Conflicts:
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5p6440/mach-smdk6440.c
arch/arm/mach-s5p6442/mach-smdk6442.c
arch/arm/mach-s5pc100/include/mach/irqs.h
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/mach-s5pv210/include/mach/irqs.h
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5pv210/mach-smdkc110.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/plat-s5p/cpu.c