]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 003a20c 49d7bc6)
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 12 Dec 2005 20:24:45 +0000 (15:24 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 12 Dec 2005 20:24:45 +0000 (15:24 -0500)
1  2 
net/core/dev.c patch | diff1 | diff2 | blob | history

diff --cc net/core/dev.c
Simple merge
Linux 2.6 source tree