diff --git a/[refs] b/[refs] index 73dd33ae68ed..8c5c4629c242 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43afb949a955a7d88f4baf43d5c676bf4c31ff6c +refs/heads/master: 92aab3c08eca4770228715d26c8234cca4fae9af diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index ec8433c39dee..b39faa31d76e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2080,6 +2080,12 @@ M: support@simtec.co.uk W: http://www.simtec.co.uk/products/EB2410ITX/ S: Supported +SIS 190 ETHERNET DRIVER +P: Francois Romieu +M: romieu@fr.zoreil.com +L: netdev@vger.kernel.org +S: Maintained + SIS 5513 IDE CONTROLLER DRIVER P: Lionel Bouton M: Lionel.Bouton@inet6.fr