diff --git a/[refs] b/[refs] index 778d814d72c6..34a625e3c7d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a16fbd65246ae13a5f6b280937c5c0cd16757141 +refs/heads/master: ce308e268cb2d6eb1343c2a242084f31f330e4fa diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index e927dd5a7956..aed7cec7183a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4565,11 +4565,6 @@ W: http://prism54.org S: Obsolete F: drivers/net/wireless/prism54/ -PROMISE DC4030 CACHING DISK CONTROLLER DRIVER -M: Peter Denison -W: http://www.pnd-pc.demon.co.uk/promise/ -S: Maintained - PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER M: Mikael Pettersson L: linux-ide@vger.kernel.org