diff options
| author | Linus Torvalds | 2018-11-24 09:42:32 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-11-24 09:42:32 -0800 |
| commit | d146194f31c96f9b260c5a1cf1592d2e7f82a2e2 (patch) | |
| tree | ff576fb60ffbe6d3bcc325b217aef65e05c1331a /net/qrtr | |
| parent | 857fa628bbe93017c72ddd0d5304962a2608db07 (diff) | |
| parent | 4f9f49646a5733c0c2bd49940673dde89a9c5add (diff) | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas::
- Fix wrong conflict resolution around CONFIG_ARM64_SSBD
- Fix sparse warning on unsigned long constant
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block
arm64: sysreg: fix sparse warnings
Diffstat (limited to 'net/qrtr')
0 files changed, 0 insertions, 0 deletions