From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Dec 2011 21:34:00 +0000 (-0800)
Subject: Merge branch 'v3.2-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e95bf44fbabf35706e0703bf77b62984909de980;p=openwrt%2Fstaging%2Fblogic.git

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

* 'v3.2-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Remove duplicated SROMC static memory mapping
  ARM: SAMSUNG: Fix build error when selecting CPU_FREQ_S3C24XX_DEBUGFS on S3C2440
---

e95bf44fbabf35706e0703bf77b62984909de980