Merge branch 'msm-core' into for-next
authorDavid Brown <davidb@codeaurora.org>
Mon, 11 Apr 2011 23:20:50 +0000 (16:20 -0700)
committerDavid Brown <davidb@codeaurora.org>
Mon, 11 Apr 2011 23:20:50 +0000 (16:20 -0700)
* msm-core:
  arm: mach-msm: acpuclock-arm11: Using __func__ instead __FUNCTION__


Trivial merge