diff --git a/[refs] b/[refs] index 0189496b55d2..3f62b096478f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3a2c3ee458bd614231e548c13acb0cf33a68631 +refs/heads/master: b3277dfaf0257221f83dd861b82c54de4507473e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4ccc5fa06d09..49e4f554d211 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2636,6 +2636,12 @@ M: promise@pnd-pc.demon.co.uk W: http://www.pnd-pc.demon.co.uk/promise/ S: Maintained +PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER +P: Mikael Pettersson +M: mikpe@it.uu.se +L: linux-ide@vger.kernel.org +S: Maintained + PS3 PLATFORM SUPPORT P: Geoff Levand M: geoffrey.levand@am.sony.com