diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-08 02:35:54 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-08 02:35:54 -0700 |
commit | 33f9936b2b73dba6c8685994c441c4fd30b04814 (patch) | |
tree | 9ce8105bc1e44ba66276695927b15df0d3fc185d /net/can | |
parent | aca51397d01474f80cab8fc978559b45f2e453ad (diff) | |
parent | f227ec3ca2b7be449fb2156e82b40cceed87a34a (diff) | |
download | linux-33f9936b2b73dba6c8685994c441c4fd30b04814.tar.bz2 |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions