From: Olof Johansson <olof@lixom.net>
Date: Sat, 12 May 2012 22:41:22 +0000 (-0700)
Subject: Merge branch 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: upstream/snapshot3+hdmi~7525^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85d5c4a362add39f7491b38ed0160df1dcae1d2b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

* 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
  ARM: EXYNOS: use s5p-timer for UniversalC210 board
---

85d5c4a362add39f7491b38ed0160df1dcae1d2b