Merge branch 'next-s5pv310' into for-next

Conflicts:
	arch/arm/mach-s5pv310/Makefile
This commit is contained in:
Kukjin Kim 2011-01-03 18:59:54 +09:00
commit c6906c3e29
8 changed files with 711 additions and 9 deletions