diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 13:34:00 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 13:34:00 -0800 |
commit | e95bf44fbabf35706e0703bf77b62984909de980 (patch) | |
tree | 095d66072d94b4168b614bcda33273fdf10645bf /init | |
parent | 3b87487ac5008072f138953b07505a7e3493327f (diff) | |
parent | 9edf52621de9b1822be2576f66269ad2cb6292b6 (diff) | |
download | op-kernel-dev-e95bf44fbabf35706e0703bf77b62984909de980.zip op-kernel-dev-e95bf44fbabf35706e0703bf77b62984909de980.tar.gz |
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions