Merge branch 'linus' into sfi-release
[linux-2.6.git] / MAINTAINERS
index 43761a0..81061c3 100644 (file)
@@ -4646,6 +4646,18 @@ L:       linux-pci@vger.kernel.org
 S:     Supported
 F:     drivers/pci/hotplug/shpchp*
 
+SIMPLE FIRMWARE INTERFACE (SFI)
+P:     Len Brown
+M:     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
+F:     arch/x86/kernel/*sfi*
+F:     drivers/sfi/
+F:     include/linux/sfi*.h
+
+
 SIMTEC EB110ATX (Chalice CATS)
 P:     Ben Dooks
 M:     Vincent Sanders <support@simtec.co.uk>