tree 095d66072d94b4168b614bcda33273fdf10645bf
parent 3b87487ac5008072f138953b07505a7e3493327f
parent 9edf52621de9b1822be2576f66269ad2cb6292b6
author Linus Torvalds <torvalds@linux-foundation.org> 1325280840 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325280840 -0800

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