From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Sep 2011 23:29:26 +0000 (-0700)
Subject: Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung
X-Git-Tag: v3.12-rc1~4737
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=858b1814b89d043a3866299c258ccdc27eb2538c;p=kernel%2Fkernel-generic.git

Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung

* 'samsung-fixes-3' of git://github.com/kgene/linux-samsung:
  ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver
  ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
  ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt
  ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv
---

858b1814b89d043a3866299c258ccdc27eb2538c