summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-15 15:37:05 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-15 15:37:05 -0700
commit91c8028c95a468da9c0aafd2d91cf24e27784206 (patch)
tree4db0431781918451e2815dc0e629c795cfa10eb3 /net/can
parent81aded24675ebda5de8a68843250ad15584ac38a (diff)
parent1d1a79b5b94b0aa84e1e78dd9acdcffb12274848 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions