diff options
| author | Linus Torvalds | 2018-02-08 11:48:49 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-02-08 11:48:49 -0800 |
| commit | 605dc7761d2701f73c17183649de0e3044609817 (patch) | |
| tree | 2fc9ed48d50e0552f5f48d23c725930bb950973f /MAINTAINERS | |
| parent | fe26adf431a58d620819618e52a10bf9b5cfde52 (diff) | |
| parent | d3fdd701248290b511683ff8d348073295f07833 (diff) | |
Merge branch 'pcmcia' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
Pull pcmcia updates from Dominik Brodowski:
"The linux-pcmcia mailing list was shut down, so offer an alternative
path for patches in MAINTAINERS.
Also, throw in two odd fixes for the pcmcia subsystem"
* 'pcmcia' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
pcmcia: soc_common: Handle return value of clk_prepare_enable
pcmcia: use proper printk format for resource
pcmcia: remove mailing list, update MAINTAINERS
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cf4258338587..4c7a2fdc9b34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10799,11 +10799,9 @@ S: Maintained F: drivers/pci/dwc/*spear* PCMCIA SUBSYSTEM -P: Linux PCMCIA Team -L: linux-pcmcia@lists.infradead.org -W: http://lists.infradead.org/mailman/listinfo/linux-pcmcia +M: Dominik Brodowski <linux@dominikbrodowski.net> T: git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git -S: Maintained +S: Odd Fixes F: Documentation/pcmcia/ F: tools/pcmcia/ F: drivers/pcmcia/ |