]> 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: a048d7a 9e956c2)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Wed, 22 Feb 2006 23:38:53 +0000 (23:38 +0000)
committerSteve French <sfrench@us.ibm.com>
Wed, 22 Feb 2006 23:38:53 +0000 (23:38 +0000)
Signed-off-by: Steve French <sfrench@us.ibm.com>
1  2 
fs/cifs/cifssmb.c patch | diff1 | diff2 | blob | history
fs/cifs/connect.c patch | diff1 | diff2 | blob | history

diff --cc fs/cifs/cifssmb.c
Simple merge
diff --cc fs/cifs/connect.c
Simple merge
CAN classifier for Linux Traffic Control