]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 22:50:08 +0000 (14:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 22:50:08 +0000 (14:50 -0800)
* 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  msm: add SMP support for msm
  msm: hotplug: support cpu hotplug on msm
  msm: timer: SMP timer support for msm
  msm: scm-boot: Support for setting cold/warm boot addresses
  msm: Secure Channel Manager (SCM) support


Trivial merge