Merge tag 'berlin-soc-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin...
authorOlof Johansson <olof@lixom.net>
Tue, 8 Jul 2014 05:41:47 +0000 (22:41 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 8 Jul 2014 05:42:24 +0000 (22:42 -0700)
Merge "Berlin SoC changes for v3.17" from Sebastian Hesselbarth:

- SMP support for BG2 and BG2Q

* tag 'berlin-soc-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: berlin: add SMP support

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/mach-berlin/Kconfig

Simple merge