]> 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: 9d89160 a1346c9)
Merge commit 'v2.6.36.2' into cangw-test-36
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 10 Dec 2010 07:48:10 +0000 (08:48 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 10 Dec 2010 07:48:10 +0000 (08:48 +0100)
1  2 
drivers/mmc/core/core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/mmc/core/core.c
Simple merge
CAN classifier for Linux Traffic Control