diff options
author | Olof Johansson <olof@lixom.net> | 2015-01-15 19:15:08 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-01-15 19:15:08 -0500 |
commit | 8614f9f7fc8fe569341be447277d52c44731c41a (patch) | |
tree | 1615d0559887973226ff967727bee97a511a3be8 /drivers/input/input-compat.c | |
parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
parent | 0048f5f3790dc4aa0d22c2612fadf39b3696b439 (diff) |
Merge tag 'arm-soc/for-3.20/maintainer' of http://github.com/broadcom/stblinux into next/fixes-non-critical
Merge "Broadcom MAINTAINERS file updates for 3.20" from Florian Fainelli:
This pull request contains updates to our MAINTAINERS files for all relevant
Broadcom SoCs: BCM63xx, Cygnus/iProc, ARM & MIPS-based BCM7xxx (brcmstb).
Our new code location for all Broadcom-related kernel activities is now on
http://github.com/broadcom/.
* tag 'arm-soc/for-3.20/maintainer' of http://github.com/broadcom/stblinux:
MAINTAINERS: add a git entry for BMIPS-based BCM7xxx SoCs
MAINTAINERS: add a git entry for BCM7xxx ARM-based SoCs
MAINTAINERS: update Broadcom Cygnus SoC git tree
MAINTAINERS: move BCM63xx ARM-based SoCs git tree
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/input/input-compat.c')
0 files changed, 0 insertions, 0 deletions