diff --git a/[refs] b/[refs] index 2d67ecf66517..915a744ae04a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b8a12bab337702c804deba9a1860ac042f69002 +refs/heads/master: b711c12113620081708c6ccd43768b5a2501e2ab diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7ca15c56ee1b..f79abf0f0122 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3046,12 +3046,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git F: drivers/video/s1d13xxxfb.c F: include/video/s1d13xxxfb.h -ETHEREXPRESS-16 NETWORK DRIVER -M: Philip Blundell -L: netdev@vger.kernel.org -S: Maintained -F: drivers/net/ethernet/i825xx/eexpress.* - ETHERNET BRIDGE M: Stephen Hemminger L: bridge@lists.linux-foundation.org