Merge tag 'arm-soc/for-4.8/drivers' of http://github.com/Broadcom/stblinux into next...
authorOlof Johansson <olof@lixom.net>
Mon, 20 Jun 2016 05:55:16 +0000 (22:55 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 20 Jun 2016 05:55:16 +0000 (22:55 -0700)
commit13d0b76b93fea4ed31764d30e6cfb4cc79ecf039
tree2a0ec845e9f841526e45f6db6c4301f748e88a67
parentd41bde8818ff8405d7d4a051c9d809f026cd6863
parenta536bcc931ed5c047100c3a28f521283749d3b9a
Merge tag 'arm-soc/for-4.8/drivers' of github.com/Broadcom/stblinux into next/drivers

This pull request contains drivers related changes for Broadcom SoCs:

- Florian moves drivers/soc/brcmstb to drivers/soc/bcm/brcmstb to be consistent with
  how other SoCs are doing it

- Chris provides a reset driver which is common to the BCM21664 and BCM23550 SoCs

- Ben fixes a warning by providing the appropriate include file

* tag 'arm-soc/for-4.8/drivers' of http://github.com/Broadcom/stblinux:
  soc: brcmstb: fix warning from missing include
  power: Introduce Broadcom kona reset driver
  soc: Move brcmstb to bcm/brcmstb

Signed-off-by: Olof Johansson <olof@lixom.net>