diff --git a/[refs] b/[refs] index 5cb672ec574b..5d77dc6393d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd4683daed6be3fd71105a8289257b75e151288c +refs/heads/master: 3365a2934cce29fa9196bc4fd7086f62e799ee84 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index c76928459f66..704d3d6da1b1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2990,10 +2990,9 @@ F: net/ipv4/netfilter/ipt_MASQUERADE.c IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER M: Francois Romieu M: Sorbica Shieh -M: Jesse Huang L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ipg.c +F: drivers/net/ipg.* IPATH DRIVER M: Ralph Campbell