tree 62cc791433225c64eddcfcf8f66c93e90ac7f0d1
parent d2919c651e750a58c3dd8b0183ac1b2700cdc01d
parent 28b874a8ba7aed5152dc426dde38239ce23d8b37
author Olof Johansson <olof@lixom.net> 1336862482 -0700
committer Olof Johansson <olof@lixom.net> 1336862482 -0700

Merge branch 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/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