From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 05:53:48 +0000 (-0700)
Subject: Merge branch 'v3.7-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.7-rc1~163^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b536661bb0091b19123fa0c22f7087fd886d7b37;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'v3.7-samsung-fixes-1' of git://git./linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical

A few non-critical fixes/cleanups for samsung platforms.

* 'v3.7-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
  ARM: S3C24XX: removes unnecessary semicolon
  ARM: S3C24xx: delete double assignment
  ARM: EXYNOS: fix address for EXYNOS4 MDMA1
  ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
  + sync to 3.6-rc6
---

b536661bb0091b19123fa0c22f7087fd886d7b37