]> err.no Git - linux-2.6/commitdiff
Merge branch 'master' of ../linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sun, 24 Feb 2008 04:38:20 +0000 (20:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 24 Feb 2008 04:38:20 +0000 (20:38 -0800)
1  2 
net/core/dev.c

diff --cc net/core/dev.c
Simple merge