| commit | e95bf44fbabf35706e0703bf77b62984909de980 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 30 13:34:00 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 30 13:34:00 2011 -0800 |
| tree | 095d66072d94b4168b614bcda33273fdf10645bf | |
| parent | 3b87487ac5008072f138953b07505a7e3493327f [diff] | |
| parent | 9edf52621de9b1822be2576f66269ad2cb6292b6 [diff] |
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