diff --git a/[refs] b/[refs] index 9ea80d8a77cd..1272b2b5e39e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f04e2aa0cbe10f06326cd7f98aaf0012d9c6038 +refs/heads/master: a31a96ad7206df554f1d1571b986abbe742d8b8e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f952e003eb9c..abb632e25f13 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2906,7 +2906,7 @@ GRETH 10/100/1G Ethernet MAC device driver M: Kristoffer Glembo L: netdev@vger.kernel.org S: Maintained -F: drivers/net/greth* +F: drivers/net/ethernet/aeroflex/ GSPCA FINEPIX SUBDRIVER M: Frank Zago