From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 16 Mar 2011 23:35:27 +0000 (+0000)
Subject: Merge branch 'p2v' into devel
X-Git-Tag: v2.6.39-rc1~463^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05e34754518b6a90d5c392790c032575fab12d66;p=pandora-kernel.git

Merge branch 'p2v' into devel

Conflicts:
	arch/arm/kernel/module.c
	arch/arm/mach-s5pv210/sleep.S
---

05e34754518b6a90d5c392790c032575fab12d66
Reading git-diff-tree failed