From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 28 Nov 2014 11:36:43 +0000 (+0100)
Subject: Merge tag 'v3.19-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~12^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3510c70df7694b282406020c51ccd67afc79dea5;p=pandora-kernel.git

Merge tag 'v3.19-rockchip-dts3' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "temporarily disable rk3288-smp" from Heiko Stuebner:

Disable smp again on rk3288 temporarily to make Olof's boottest
run again, until the patches for using the physical architected
timers got accepted.

* tag 'v3.19-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: temporarily disable smp on rk3288

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

3510c70df7694b282406020c51ccd67afc79dea5
Reading git-diff-tree failed