summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-12-20 00:13:14 +0400
committerDavid S. Miller <davem@davemloft.net>2013-12-20 00:13:14 +0400
commitde47c4ab25d43a98e629cc11c2d90ae56145b35d (patch)
treefb45b6c3a08658cb39203366f70469c0610e0f9a /MAINTAINERS
parentb89587a7af4b2a2e0682c304224be4041e993548 (diff)
parent21629e1a118402566dce08f26edf19954fecef32 (diff)
downloadlinux-de47c4ab25d43a98e629cc11c2d90ae56145b35d.tar.xz
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
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