tree 1eb941524c7325672f947dab525d96228b362e20
parent 6b8eda04ffdc24b68d379a32358f4f09a425a380
parent 0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1
author Kukjin Kim <kgene.kim@samsung.com> 1281098095 +0900
committer Kukjin Kim <kgene.kim@samsung.com> 1281098095 +0900

Merge branch 'next-s5p' into for-next

Conflicts:
	arch/arm/mach-s5pv210/mach-aquila.c
	arch/arm/mach-s5pv210/mach-goni.c