From: Olof Johansson <olof@lixom.net>
Date: Tue, 13 Jan 2015 01:58:19 +0000 (-0800)
Subject: Merge tag 'berlin-dt-for-3.20-1' of git://git.infradead.org/users/hesselba/linux... 
X-Git-Tag: fixes-v4.0-rc1~86^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d708da24fba0e9a9159394d8d58e233fba7de103;p=pandora-kernel.git

Merge tag 'berlin-dt-for-3.20-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

Merge "ARM: berlin: DT changes for v3.20 (round 1)" from Sebastian Hesselbarth:

Berlin DT changes for v3.20 (round 1)
- add PMU nodes for BG2Q and BG2CD
- add PPI CPU masks for TWD timer interrupts

* tag 'berlin-dt-for-3.20-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: berlin: add PPI cpu mask to twd timer interrupts
  ARM: dts: berlin: add pmu node for BG2Q and BG2CD

Signed-off-by: Olof Johansson <olof@lixom.net>
---

d708da24fba0e9a9159394d8d58e233fba7de103
Reading git-diff-tree failed