From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 20 May 2010 11:25:59 +0000 (+0900)
Subject: ARM: Merge for-2635-4/onenand
X-Git-Tag: v2.6.35-rc1~264^2~1^2^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=206a1a825dc67060ee319c99569755ba11250907;p=pandora-kernel.git

ARM: Merge for-2635-4/onenand

Merge branch 'for-2635-4/onenand' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s5pc100/cpu.c
	arch/arm/mach-s5pc100/include/mach/map.h
	arch/arm/mach-s5pv210/Makefile
---

206a1a825dc67060ee319c99569755ba11250907
Reading git-diff-tree failed