From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 6 Aug 2010 12:34:55 +0000 (+0900)
Subject: Merge branch 'next-s5p' into for-next
X-Git-Tag: v2.6.36-rc1~102^2^2^2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2b7e3c54a304677a1142829fb5913595885379f;p=pandora-kernel.git

Merge branch 'next-s5p' into for-next

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

f2b7e3c54a304677a1142829fb5913595885379f
Reading git-diff-tree failed