From: Kukjin Kim <kgene.kim@samsung.com>
Date: Mon, 3 Jan 2011 09:59:54 +0000 (+0900)
Subject: Merge branch 'next-s5pv310' into for-next
X-Git-Tag: v2.6.38-rc1~38^2^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6906c3e29a4a28660f70421935c91cf6b8ab1e1;p=pandora-kernel.git

Merge branch 'next-s5pv310' into for-next

Conflicts:
	arch/arm/mach-s5pv310/Makefile
---

c6906c3e29a4a28660f70421935c91cf6b8ab1e1
Reading git-diff-tree failed