Merge branch 'msm-core' into for-next
authorDavid Brown <davidb@codeaurora.org>
Fri, 28 Jan 2011 19:31:53 +0000 (11:31 -0800)
committerDavid Brown <davidb@codeaurora.org>
Fri, 28 Jan 2011 19:31:53 +0000 (11:31 -0800)
commitecca8194c16bdf6cde99a2b29c23a77901cd61a6
tree80b533b480b94b1bdc4dad3b0d300868f44cde04
parentd1f4cec78ee3141a78b2b35969f5bebf7ea9b208
parent07a3cc4814f790354d4c7be2c9dc6143a714a07a
Merge branch 'msm-core' into for-next

* msm-core:
  msm: Clean up useless ifdefs
  msm: clock: Add support for more proc_comm clocks
  msm: clock: Invert debugfs directory layout
  msm: clock: Move debugfs code from clock.c to clock-debug.c
  msm: clock: Remove 7x30 and pcom includes from clock.h
  msm: clock: Remove unused code and definitions
  msm: Warning fix in trout gpio board file
  msm: Remove broken register definition from trout
arch/arm/mach-msm/board-qsd8x50.c
arch/arm/mach-msm/devices-msm7x00.c
arch/arm/mach-msm/devices-msm7x30.c
arch/arm/mach-msm/devices-qsd8x50.c