diff --git a/[refs] b/[refs] index 1ac733fafbde..99c522ee33f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4b49dee1ac0ae0660ef697fdab789dc92f59c6f +refs/heads/master: 8e406fe4aebee50b18176947a68aab6f519843de diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 94b823f71e94..63ce3a38b332 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5329,14 +5329,15 @@ PIN CONTROL SUBSYSTEM M: Linus Walleij S: Maintained F: drivers/pinctrl/ +F: include/linux/pinctrl/ PIN CONTROLLER - ST SPEAR -M: Viresh Kumar +M: Viresh Kumar L: spear-devel@list.st.com L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear S: Maintained -F: driver/pinctrl/spear/ +F: drivers/pinctrl/spear/ PKTCDVD DRIVER M: Peter Osterlund