diff options
| author | Linus Torvalds | 2020-01-29 11:03:21 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2020-01-29 11:03:21 -0800 |
| commit | 80b60e3849bfe987801a73ebd4bab43b7b591a09 (patch) | |
| tree | 54a3e6ad4f960ddaa2c3eda7deba1c518d6a6fdb /MAINTAINERS | |
| parent | 701a9c8092ddf299d7f90ab2d66b19b4526d1186 (diff) | |
| parent | 74777eaf7aef0f80276cb1c3fad5b8292c368859 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar:
"Three objtool fixes, plus marking SFI as obsolete"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Skip samples subdirectory
objtool: Fix ARCH=x86_64 build error
objtool: Silence build output
MAINTAINERS: Mark simple firmware interface (SFI) obsolete
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index eb2ea59932b9..d9d7f71c5ce3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15177,11 +15177,8 @@ F: drivers/video/fbdev/sm712* F: Documentation/fb/sm712fb.rst SIMPLE FIRMWARE INTERFACE (SFI) -M: Len Brown <lenb@kernel.org> -L: sfi-devel@simplefirmware.org W: http://simplefirmware.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git -S: Supported +S: Obsolete F: arch/x86/platform/sfi/ F: drivers/sfi/ F: include/linux/sfi*.h |