diff --git a/[refs] b/[refs] index 9a20b536ab6a..2972301a8a3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fb844961818ce94e782acf6a96b92dc2303553b +refs/heads/master: 01f2073411e01777e3c6f45a4bf05ea76493f326 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 796e891083b7..f0596e452c5c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1137,9 +1137,9 @@ T: git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git S: Maintained DSCC4 DRIVER -P: François Romieu -M: romieu@cogenit.fr -M: romieu@ensta.fr +P: Francois Romieu +M: romieu@fr.zoreil.com +L: netdev@vger.kernel.org S: Maintained DVB SUBSYSTEM AND DRIVERS @@ -3574,6 +3574,12 @@ M: khali@linux-fr.org L: i2c@lm-sensors.org S: Maintained +VIA VELOCITY NETWORK DRIVER +P: Francois Romieu +M: romieu@fr.zoreil.com +L: netdev@vger.kernel.org +S: Maintained + UCLINUX (AND M68KNOMMU) P: Greg Ungerer M: gerg@uclinux.org