commit | 2df9ce91e9418dba7fe4b12f0c9ae06650655a74 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Sat Jul 12 09:47:12 2014 -0700 |
committer | Olof Johansson <olof@lixom.net> | Sat Jul 12 09:47:12 2014 -0700 |
tree | 1221e39458b9586094cc920d0c2d84e5c30a61cb | |
parent | 9641f4084aa3ac11cd47fa9b8325971769dac577 [diff] | |
parent | 02db444db1256341d14acb7813abd67ddd94c350 [diff] |
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 <olof@lixom.net>