diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 22:34:00 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-30 22:34:00 +0100 |
commit | e95bf44fbabf35706e0703bf77b62984909de980 (patch) | |
tree | 095d66072d94b4168b614bcda33273fdf10645bf /fs | |
parent | Revert "clockevents: Set noop handler in clockevents_exchange_device()" (diff) | |
parent | ARM: EXYNOS: Remove duplicated SROMC static memory mapping (diff) | |
download | linux-e95bf44fbabf35706e0703bf77b62984909de980.tar.xz linux-e95bf44fbabf35706e0703bf77b62984909de980.zip |
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 'fs')
0 files changed, 0 insertions, 0 deletions