diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-30 16:39:36 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-30 16:39:36 -0800 |
commit | 03e319e5465a2da6fb188c77043775f2888df529 (patch) | |
tree | 303afaf6b31a110d27bbc2fcee0f68648fb2665f /fs/nls/nls_cp936.c | |
parent | 8c947645151cc2c279c75c7f640dd8f0fc0b9aa2 (diff) | |
parent | 1bea2a937dadd188de70198b0cf3915e05a506e4 (diff) | |
download | linux-stable-03e319e5465a2da6fb188c77043775f2888df529.tar.gz linux-stable-03e319e5465a2da6fb188c77043775f2888df529.tar.bz2 linux-stable-03e319e5465a2da6fb188c77043775f2888df529.zip |
Merge tag 'for-linus' of git://github.com/openrisc/linux
Pull OpenRISC fix from Stafford Horne:
"Fix config dependencies for Litex SOC driver causing issues on um"
* tag 'for-linus' of git://github.com/openrisc/linux:
soc: litex: Properly depend on HAS_IOMEM
Diffstat (limited to 'fs/nls/nls_cp936.c')
0 files changed, 0 insertions, 0 deletions