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

MAINTAINERS: update WOLFSON MICROELECTRONICS

Integrate P:/M: lines Remove L: linux-kernel@vger.kernel.org

Signed-off-by: Joe Perches joe@perches.com Cc: Mark Brown broonie@opensource.wolfsonmicro.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 5ad2a76..6a3f5ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5799,9 +5799,7 @@ F: drivers/input/touchscreen/*wm97* F: include/linux/wm97xx.h

WOLFSON MICROELECTRONICS PMIC DRIVERS -P: Mark Brown -M: broonie@opensource.wolfsonmicro.com -L: linux-kernel@vger.kernel.org +M: Mark Brown broonie@opensource.wolfsonmicro.com T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus W: http://opensource.wolfsonmicro.com/node/8 S: Supported