Merge tag 'arm-soc/for-4.4/defconfig' of http://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Oct 2015 14:03:48 +0000 (16:03 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Oct 2015 14:03:48 +0000 (16:03 +0200)
Merge "Broadcom defconfig changes for v4.4" from Florian Fainelli:

This pull request contains the following changes for the multi_v7_defconfig:

- Jon adds support for the NorthStar Plus SocS to the multi_v7_defconfig file

* tag 'arm-soc/for-4.4/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Add NSP to defconfig

1  2 
arch/arm/configs/multi_v7_defconfig

Simple merge