Commit 74777eaf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/documentation' into core/urgent, to pick up single commit 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 87284978 b2aa0917

MAINTAINERS

+1 −4
Original line number Original line Diff line number Diff line
@@ -15044,11 +15044,8 @@ F: drivers/video/fbdev/sm712* 
F:	Documentation/fb/sm712fb.rst

F:	Documentation/fb/sm712fb.rst











SIMPLE FIRMWARE INTERFACE (SFI)




SIMPLE FIRMWARE INTERFACE (SFI)








M:	Len Brown <lenb@kernel.org>










L:	sfi-devel@simplefirmware.org










W:	http://simplefirmware.org/




W:	http://simplefirmware.org/








T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git




S:	Obsolete








S:	Supported










F:	arch/x86/platform/sfi/




F:	arch/x86/platform/sfi/








F:	drivers/sfi/




F:	drivers/sfi/








F:	include/linux/sfi*.h




F:	include/linux/sfi*.h