diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-12 17:58:19 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-12 17:58:19 -0800 |
| commit | d708da24fba0e9a9159394d8d58e233fba7de103 (patch) | |
| tree | d0869671f53470534e3b7dfb0191713519b52d1f /arch/arm/mach-pxa/mp900.c | |
| parent | cb612390e5469186301a7856116fcdbfd9fb3c90 (diff) | |
| parent | 2356d2f3d1b742dacdeb1b0a038ec17f7cc2947f (diff) | |
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>
Diffstat (limited to 'arch/arm/mach-pxa/mp900.c')
0 files changed, 0 insertions, 0 deletions