From: Olof Johansson <olof@lixom.net>
Date: Sat, 30 Jun 2012 22:27:52 +0000 (-0700)
Subject: Merge branch 'v3.5-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~2533^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d5474df64d49564f297d9259932452ea64b745d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v3.5-samsung-fixes-1' of git://git./linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.5-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Fix EXYNOS_DEV_DMA Kconfig entry
  ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping
  ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL
---

5d5474df64d49564f297d9259932452ea64b745d