Merge branch 'v3.7-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 05:53:48 +0000 (22:53 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 05:54:15 +0000 (22:54 -0700)
commitb536661bb0091b19123fa0c22f7087fd886d7b37
treee83c4ff9bbfe94155cbc7b25fb3b62b814e79ad7
parent20804abdbcfced47b460e5794a685d48225ac754
parentfb997a46626dca2778fa7570bb516d8486f2f837
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
arch/arm/mach-omap2/omap-wakeupgen.c
drivers/tty/serial/imx.c