From: Kukjin Kim <kgene.kim@samsung.com>
Date: Tue, 4 Oct 2011 11:18:36 +0000 (+0900)
Subject: Merge branch 'next-samsung-devel' into next-samsung-devel-2
X-Git-Tag: v3.2-rc1~40^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db3c94a7edc6b29f8d52ba5884dec6a15feeadad;p=pandora-kernel.git

Merge branch 'next-samsung-devel' into next-samsung-devel-2

Conflicts:
	arch/arm/mach-exynos4/clock.c
	arch/arm/mach-s3c2412/gpio.c
	arch/arm/mach-s5p64x0/dma.c
	arch/arm/mach-s5p64x0/gpiolib.c
---

db3c94a7edc6b29f8d52ba5884dec6a15feeadad
Reading git-diff-tree failed