projects / profile / common / platform / kernel / linux-artik7.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9641f40 02db444)
Merge tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1...
authorOlof Johansson <olof@lixom.net>
Sat, 12 Jul 2014 16:47:12 +0000 (09:47 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 12 Jul 2014 16:47:12 +0000 (09:47 -0700)
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>

Trivial merge
Domain: System / Kernel;