diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-29 20:03:21 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-29 20:03:21 +0100 |
commit | 80b60e3849bfe987801a73ebd4bab43b7b591a09 (patch) | |
tree | 54a3e6ad4f960ddaa2c3eda7deba1c518d6a6fdb /MAINTAINERS | |
parent | Merge tag 'char-misc-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | Merge branch 'core/documentation' into core/urgent, to pick up single commit (diff) | |
download | linux-80b60e3849bfe987801a73ebd4bab43b7b591a09.tar.xz linux-80b60e3849bfe987801a73ebd4bab43b7b591a09.zip |
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 |