From: Olof Johansson Date: Sat, 12 Jul 2014 16:47:12 +0000 (-0700) Subject: Merge tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1... X-Git-Tag: v3.17-rc1~80^2~16 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2df9ce91e9418dba7fe4b12f0c9ae06650655a74;p=linux.git Merge tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup Merge "mmp for v3.17" from Haojian Zhuang: * tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux: ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define Signed-off-by: Olof Johansson --- 2df9ce91e9418dba7fe4b12f0c9ae06650655a74