diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 01:12:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 01:12:21 +0200 |
| commit | 45df60cd2cbe2a8c32fd34e474b62b2b41bacf69 (patch) | |
| tree | a0f38f6d02ad1d64ca65470a85ad9ccfe28c8b4e /arch/um/Kconfig.char | |
| parent | Merge tag 'nios2-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | MAINTAINERS: Update ASPEED entry with details (diff) | |
| download | linux-45df60cd2cbe2a8c32fd34e474b62b2b41bacf69.tar.xz linux-45df60cd2cbe2a8c32fd34e474b62b2b41bacf69.zip | |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"Here is a very small set of fixes for inclusion in linux-4.17-rc1: Two
changes for the maintainer file, and one more fix for the newly added
npcm platform, to enable the level 2 cache controller"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
MAINTAINERS: Update ASPEED entry with details
MAINTAINERS: Migrate oxnas list to groups.io
arm: npcm: enable L2 cache in NPCM7xx architecture
Diffstat (limited to 'arch/um/Kconfig.char')
0 files changed, 0 insertions, 0 deletions