From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 4 Dec 2014 15:44:05 +0000 (+0100)
Subject: Merge tag 'arm-soc/for-3.19/brcmstb-drivers' of https://github.com/brcm/linux into... 
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~13^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=136a713d80476fe993284bdf8b21709c179c9965;p=pandora-kernel.git

Merge tag 'arm-soc/for-3.19/brcmstb-drivers' of https://github.com/brcm/linux into next/drivers

This pull request contains the following changes to the Broadcom GISB bus
arbiter from Kevin Cernekee:

- Extend brcmstb GISB bus driver to work on MIPS (currently ARM-only) and support
  65nm and 40nm MIPS-based chips such as: BCM7038, BCM7400 and BCM7435

* tag 'arm-soc/for-3.19/brcmstb-drivers' of https://github.com/brcm/linux:
  bus: brcmstb_gisb: Add register offset tables for older chips
  bus: brcmstb_gisb: Look up register offsets in a table
  bus: brcmstb_gisb: Introduce wrapper functions for MMIO accesses
  bus: brcmstb_gisb: Make the driver buildable on MIPS

Conflicts:
	drivers/bus/brcmstb_gisb.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

136a713d80476fe993284bdf8b21709c179c9965
Reading git-diff-tree failed