diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:59:07 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:59:07 +0200 |
| commit | 32f4049a1f62abe95a3f1da83402d510a6ec5487 (patch) | |
| tree | 8ab9f593ceea8f7436a675bdb9d2dd4b1bfef891 /drivers/net/ethernet/mellanox/mlx4/srq.c | |
| parent | Merge tag 'hisi-defconfig-for-4.14' of git://github.com/hisilicon/linux-hisi into next/arm64 (diff) | |
| parent | arm64: defconfig: add CONFIG_BRCMSTB_THERMAL (diff) | |
| download | linux-dev-32f4049a1f62abe95a3f1da83402d510a6ec5487.tar.xz linux-dev-32f4049a1f62abe95a3f1da83402d510a6ec5487.zip | |
Merge tag 'arm-soc/for-4.14/defconfig-arm64' of http://github.com/Broadcom/stblinux into next/arm64
Pull "Broadcom defconfig-arm64 changes for 4.14" from Florian Fainelli:
This pull request contains ARM64 defconfig changes for Broadcom ARM64-based
SoCs for 4.14, please pull the following:
- Markus enables the Broadcom STB AVS thermal monitoring driver as a module
which is currently queued in Rui Zhang's tree
* tag 'arm-soc/for-4.14/defconfig-arm64' of http://github.com/Broadcom/stblinux:
arm64: defconfig: add CONFIG_BRCMSTB_THERMAL
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/srq.c')
0 files changed, 0 insertions, 0 deletions