From: Kukjin Kim <kgene.kim@samsung.com>
Date: Thu, 30 Dec 2010 01:52:32 +0000 (+0900)
Subject: Merge branch 'next-s5pv210' into for-next-new
X-Git-Tag: v2.6.38-rc1~38^2^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ae9a22b45b9e9d0f6058e5257b2daf48036dd35;p=pandora-kernel.git

Merge branch 'next-s5pv210' into for-next-new

Conflicts:
	arch/arm/mach-s5pv210/mach-smdkv210.c
---

0ae9a22b45b9e9d0f6058e5257b2daf48036dd35
Reading git-diff-tree failed