]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20804ab fb997a4)
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)
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

1  2 
arch/arm/mach-omap2/omap-wakeupgen.c patch | diff1 | diff2 | blob | history
drivers/tty/serial/imx.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/omap-wakeupgen.c
Simple merge
diff --cc drivers/tty/serial/imx.c
Simple merge
Andy's Linux Kernel repo