diff --git a/[refs] b/[refs] index 14afaffdd099..7e914708c705 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6b056911af54b40a996fdb751d441158d8078b6 +refs/heads/master: 055bcbcb361d9d1c750c251bf864ea6db9de55b2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 13608bd2e791..c1ec5d6ca90f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6303,7 +6303,7 @@ S: Supported F: drivers/input/touchscreen/*wm97* F: include/linux/wm97xx.h -WOLFSON MICROELECTRONICS PMIC DRIVERS +WOLFSON MICROELECTRONICS DRIVERS M: Mark Brown T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus W: http://opensource.wolfsonmicro.com/node/8 @@ -6319,8 +6319,8 @@ F: drivers/watchdog/wm83*_wdt.c F: include/linux/mfd/wm831x/ F: include/linux/mfd/wm8350/ F: include/linux/mfd/wm8400* -F: sound/soc/codecs/wm8350.* -F: sound/soc/codecs/wm8400.* +F: include/sound/wm????.h +F: sound/soc/codecs/wm* X.25 NETWORK LAYER M: Andrew Hendry