]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
projects / lisovros / linux_canprio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b37fa16 323f99c 80a506b)
Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 27 Jul 2010 16:19:32 +0000 (18:19 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 27 Jul 2010 16:19:32 +0000 (18:19 +0200)

Trivial merge
CAN classifier for Linux Traffic Control