diff --git a/[refs] b/[refs] index 4546cfd2268e..149972a6f308 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3a05978f18a38ae13bb3f1184abf3c999e06da9 +refs/heads/master: f1465f7ea9e7aecba8e41d4aac9240f9b7fe2e24 diff --git a/trunk/Documentation/networking/TODO b/trunk/Documentation/networking/TODO deleted file mode 100644 index 66d36ff14bae..000000000000 --- a/trunk/Documentation/networking/TODO +++ /dev/null @@ -1,18 +0,0 @@ -To-do items for network drivers -------------------------------- - -* Move ethernet crc routine to generic code - -* (for 2.5) Integrate Jamal Hadi Salim's netdev Rx polling API change - -* Audit all net drivers to make sure magic packet / wake-on-lan / - similar features are disabled in the driver by default. - -* Audit all net drivers to make sure the module always prints out a - version string when loaded as a module, but only prints a version - string when built into the kernel if a device is detected. - -* Add ETHTOOL_GDRVINFO ioctl support to all ethernet drivers. - -* dmfe PCI DMA is totally wrong and only works on x86 - diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index e5b051f0e27e..c9465811addc 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1885,6 +1885,7 @@ NETWORKING [GENERAL] P: Networking Team M: netdev@vger.kernel.org L: netdev@vger.kernel.org +W: http://linux-net.osdl.org/ S: Maintained NETWORKING [IPv4/IPv6]