Merge branch 'master' into ozonet

diff --cc include/kernel-version.mk
index b555407f2bf852f0fbc33e15302881f8f84339a5,007ae358cd67aa69e113b6a48dceaee82c0a5423..befc384aa1ba89d5c53ccd6869714ce5fa18bc41
--- 1/include/kernel-version.mk
--- 2/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@@ -6,13 -6,13 +6,13 @@@ ifdef CONFIG_TESTING_KERNE
    KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
  endif
  
 -LINUX_VERSION-4.14 = .193
 +LINUX_VERSION-4.14 = .194
  LINUX_VERSION-4.19 = .138
- LINUX_VERSION-5.4 = .59
+ LINUX_VERSION-5.4 = .60
  
 -LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
 +LINUX_KERNEL_HASH-4.14.194 = 3ea4d0221a071d58703cd346a8a6ef1582a32a8c4565a4919578817444d4fae0
  LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02
- LINUX_KERNEL_HASH-5.4.59 = 9bcb9db2e4435f2e5948375862baf0973f1d7860ebe3d750383e5a6deac4b2fd
+ LINUX_KERNEL_HASH-5.4.60 = add2ab2385c40fc9a3dfebe403e56da8500b633dc7dc42cf0c670c61d151a223
  
  remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
  sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

diff --cc package/kernel/mac80211/ath.mk
Simple merge