From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 Jul 2016 13:33:54 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into... 
X-Git-Tag: Ubuntu-5.2.0-15.16~8702^2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=147de9757d49768b1163bcb02eb86039628ab47f;p=mirror_ubuntu-eoan-kernel.git

Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into next/soc

Merge "the second part of the Broadcom ARM-based SoC changes" from Florian Fainelli:

- Florian updates the DEBUG_UART_BCM5301X entry to cover both NS and NSP SoCs
  since they both have the same location

* tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux:
  ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
---

147de9757d49768b1163bcb02eb86039628ab47f