Merge tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan...
commitdbde117c31263fb632a5bfcafe4fe769663e8991
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Dec 2018 13:05:28 +0000 (7 14:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Dec 2018 13:05:28 +0000 (7 14:05 +0100)
tree6b9eb103c5dd22a632382f2a86fd4a4c5f563098
parent37c2578c0c40e286bc0d30bdc05290b2058cf66e
parent63cea1f735284b2244e3f031625c65373520eff9
Merge tag 'gnss-4.20-rc6' of https://git./linux/kernel/git/johan/gnss into char-misc-linus

Johan writes:

GNSS fixes for 4.20-rc6

Here's a fix for a broken activation retry loop in the sirf driver.

Included are also two MAINTAINERS updates.

All have been in linux-next with no reported issues.

Signed-off-by: Johan Hovold <johan@kernel.org>
* tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss:
  MAINTAINERS: exclude gnss from SIRFPRIMA2 regex matching
  MAINTAINERS: add gnss scm tree
  gnss: sirf: fix activation retry handling