[GIT][for v3.17] pull request from mmp git tree

[Haojian Zhuang]

Hi Arnd, Olof, Kevin,

Please help to merge pull request from mmp git tree.

Best Regards
Haojian

The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:

  Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux.git
tags/mmp-for-v3.17

for you to fetch changes up to 02db444db1256341d14acb7813abd67ddd94c350:

  ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define (2014-07-04 21:19:08 +0800)

----------------------------------------------------------------
mmp for v3.17

----------------------------------------------------------------
Dan Carpenter (1):
      ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define

 arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 1 -
 1 file changed, 1 deletion(-)