projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2df9ce91e9418dba7fe4b12f0c9ae06650655a74
tree1221e39458b9586094cc920d0c2d84e5c30a61cbtree | snapshot
parent9641f4084aa3ac11cd47fa9b8325971769dac577commit | diff
parent02db444db1256341d14acb7813abd67ddd94c350commit | diff
Merge tag 'mmp-for-v3.17' of https://git./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>
Unnamed repository; edit this file 'description' to name the repository.