The following commit has been merged in the linux branch: commit 2bf822d79f81c5923bce5630d2815857b5b98a6e Author: Joe Perches joe@perches.com Date: Mon Oct 26 16:49:44 2009 -0700

MAINTAINERS: SIMPLE FIRMWARE INTERFACE: update email style

Signed-off-by: Joe Perches joe@perches.com Cc: Len Brown lenb@kernel.org Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/MAINTAINERS b/MAINTAINERS index 8ea20fc..cbea223 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4714,8 +4714,7 @@ F: drivers/usb/gadget/lh7a40* F: drivers/usb/host/ohci-lh7a40*

SIMPLE FIRMWARE INTERFACE (SFI) -P: Len Brown -M: lenb@kernel.org +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