Merge branch 'akpm' (aka "Andrew's patch-bomb")
[linux-2.6.git] / MAINTAINERS
index cf6b2d8..0460f65 100644 (file)
@@ -5125,7 +5125,7 @@ F:        drivers/*/*/picoxcell*
 PIN CONTROL SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
-F:     drivers/pinmux/
+F:     drivers/pinctrl/
 
 PKTCDVD DRIVER
 M:     Peter Osterlund <petero2@telia.com>