Merge branch 'next-s5p' into for-next

Conflicts:
	arch/arm/mach-s5pv210/mach-aquila.c
	arch/arm/mach-s5pv210/mach-goni.c
This commit is contained in:
Kukjin Kim 2010-08-06 21:34:55 +09:00
commit f2b7e3c54a
20 changed files with 202 additions and 129 deletions