From: Arnd Bergmann Date: Fri, 22 May 2015 14:32:02 +0000 (+0200) Subject: Merge tag 'arm-soc/for-4.2/soc-take2' of http://github.com/broadcom/stblinux into... X-Git-Tag: firefly_0821_release~176^2~1557^2~16 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a4526915b67afb09c60bece6bc395e58ba83e271;p=firefly-linux-kernel-4.4.55.git Merge tag 'arm-soc/for-4.2/soc-take2' of github.com/broadcom/stblinux into next/soc Merge mach-bcm changes from Florian Fainelli: This pull request contains the following changes: - Rafal adds an additional fault code to be ignored by the kernel on BCM5301X SoC - BCM63138 SMP support which: * common code to control the PMB bus, to be shared with a reset controller driver in drivers/reset * secondary CPU initialization sequence using PMB helpers * small changes suggested by Russell King to allow platforms to disable VFP * tag 'arm-soc/for-4.2/soc-take2' of http://github.com/broadcom/stblinux: ARM: BCM63xx: Add SMP support for BCM63138 ARM: vfp: Add vfp_disable for problematic platforms ARM: vfp: Add include guards ARM: BCM63xx: Add secondary CPU PMB initialization sequence ARM: BCM63xx: Add Broadcom BCM63xx PMB controller helpers ARM: BCM5301X: Ignore another (BCM4709 specific) fault code --- a4526915b67afb09c60bece6bc395e58ba83e271