summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-24 15:16:11 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-24 15:16:11 -0800
commit5955e7524790a2c8972487ab43347c28a1931521 (patch)
tree0121e9869e070cdaf9007dacf595be900bce1f4c /net
parentfd0273c5033630b8673554cd39660435d1ab2ac4 (diff)
parent3a5655a5b545e9647c3437473ee3d815fe1b9050 (diff)
downloadlinux-5955e7524790a2c8972487ab43347c28a1931521.tar.bz2
Merge branch 'can/at91_can-for-net-2.6' of git://git.pengutronix.de/git/mkl/linux-2.6
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions