diff --git a/[refs] b/[refs] index 408ee5e561f5..264ab37d5792 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21c26f50f508dd020f551a9b162f8b6030e9200a +refs/heads/master: 43b0f91d42a4dd602a72aa7a6508f484773f0922 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7fb387774399..3594a73974b1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5269,11 +5269,6 @@ L: netdev@vger.kernel.org S: Supported F: drivers/net/smsc9420.* -SMX UIO Interface -M: Ben Nizette -S: Maintained -F: drivers/uio/uio_smx.c - SN-IA64 (Itanium) SUB-PLATFORM M: Jes Sorensen L: linux-altix@sgi.com