diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2018-12-07 14:05:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2018-12-07 14:05:28 +0100 |
| commit | dbde117c31263fb632a5bfcafe4fe769663e8991 (patch) | |
| tree | 6b9eb103c5dd22a632382f2a86fd4a4c5f563098 /MAINTAINERS | |
| parent | Drivers: hv: vmbus: Offload the handling of channels to two workqueues (diff) | |
| parent | MAINTAINERS: exclude gnss from SIRFPRIMA2 regex matching (diff) | |
| download | linux-dbde117c31263fb632a5bfcafe4fe769663e8991.tar.gz linux-dbde117c31263fb632a5bfcafe4fe769663e8991.tar.bz2 linux-dbde117c31263fb632a5bfcafe4fe769663e8991.zip | |
Merge tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6682420421c1..0f083103d625 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1472,6 +1472,7 @@ F: drivers/clk/sirf/ F: drivers/clocksource/timer-prima2.c F: drivers/clocksource/timer-atlas7.c N: [^a-z]sirf +X: drivers/gnss ARM/EBSA110 MACHINE SUPPORT M: Russell King <linux@armlinux.org.uk> @@ -6316,6 +6317,7 @@ F: include/uapi/linux/gigaset_dev.h GNSS SUBSYSTEM M: Johan Hovold <johan@kernel.org> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git S: Maintained F: Documentation/ABI/testing/sysfs-class-gnss F: Documentation/devicetree/bindings/gnss/ |