Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

Marc Kleine-Budde says:

====================
this is a pull request of four patches for net-next/master.

There is one patch by Markus Pargmann, which speeds up the c_can
driver, a patch by John Whitmore which updates the in tree
documentation. A patch by Jeff Kirsher which replaces the FSF's address
by a link and a patch by Alexander Shiyan which converts the mcp251x
driver to make use of managed resources.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 603f10207973..9bae7901162d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2008,6 +2008,7 @@ L:	linux-can@vger.kernel.org
 W:      http://gitorious.org/linux-can
 T:      git git://gitorious.org/linux-can/linux-can-next.git
 S:      Maintained
+F:      Documentation/networking/can.txt
 F:      net/can/
 F:      include/linux/can/core.h
 F:      include/uapi/linux/can.h