projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 857fa62 4f9f496)
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Nov 2018 17:42:32 +0000 (09:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Nov 2018 17:42:32 +0000 (09:42 -0800)
commitd146194f31c96f9b260c5a1cf1592d2e7f82a2e2
treeff576fb60ffbe6d3bcc325b217aef65e05c1331atree | snapshot
parent857fa628bbe93017c72ddd0d5304962a2608db07commit | diff
parent4f9f49646a5733c0c2bd49940673dde89a9c5addcommit | diff
Merge tag 'arm64-fixes' of git://git./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
John Crispins staging tree