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

MAINTAINERS: fix up PERIPHERAL spelling

Signed-off-by: Joe Perches joe@perches.com Cc: Li Yang leoli@freescale.com 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 4d809ff..5ad2a76 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2151,7 +2151,7 @@ S: Supported F: arch/powerpc/sysdev/qe_lib/ F: arch/powerpc/include/asm/*qe.h

-FREESCALE USB PERIPHERIAL DRIVERS +FREESCALE USB PERIPHERAL DRIVERS M: Li Yang leoli@freescale.com L: linux-usb@vger.kernel.org L: linuxppc-dev@ozlabs.org