From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 28 Oct 2010 11:27:34 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: v2.6.37-rc1~23^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9cef506815386df4bd7e463b59e0a0984ce0355;p=pandora-kernel.git

Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/mach-s3c64xx/dev-audio.c
---

f9cef506815386df4bd7e463b59e0a0984ce0355
Reading git-diff-tree failed