Merge branch 'next-s5pv310' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 3 Jan 2011 09:59:54 +0000 (18:59 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 3 Jan 2011 09:59:54 +0000 (18:59 +0900)
commitc6906c3e29a4a28660f70421935c91cf6b8ab1e1
tree40d97bdc21b95788ab24a4824c769b9dbe9b602b
parent285dee7ff4fb4b32838694d4378f4aa938cf5b43
parent8267e2e0fba74a944f9d0c9afd7779eb7272f5e7
Merge branch 'next-s5pv310' into for-next

Conflicts:
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/clock.c
arch/arm/mach-s5pv310/include/mach/map.h