tree 36957f514bb0d4336863e7673f4251eacd54b20a
parent 68aaed54e7682aef261d5c2cf99e85a9dbf33a84
parent 922cd657c95fe3e4214d68a958e98288b7a55bba
author David S. Miller <davem@davemloft.net> 1349924236 -0400
committer David S. Miller <davem@davemloft.net> 1349924236 -0400

Merge branch 'uapi-for-3.7' of git://gitorious.org/linux-can/linux-can

Marc Kleine-Budde says:

====================
this pull request for net, i.e. the v3.7 release cycle, contains the patch by
David Howells to move the UAPI related headers for the CAN subsystem.
====================

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