diff --git a/[refs] b/[refs] index 0e22bfb22459..f5e3e8486171 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f37a0b49656ed961598351da3ebdd89f2d2e5b4 +refs/heads/master: a53bfa07369b7c3448a60d29f0fc2e81751ed0b7 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 447560284996..4b823fff515f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5133,6 +5133,15 @@ L: linux-mtd@lists.infradead.org S: Maintained F: drivers/mtd/devices/phram.c +PICOXCELL SUPPORT +M: Jamie Iles +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +T: git git://github.com/jamieiles/linux-2.6-ji.git +S: Supported +F: arch/arm/mach-picoxcell +F: drivers/*/picoxcell* +F: drivers/*/*/picoxcell* + PIN CONTROL SUBSYSTEM M: Linus Walleij S: Maintained