Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Feb 2011 20:25:19 +0000 (12:25 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Feb 2011 20:25:19 +0000 (12:25 -0800)
1  2 
net/core/dev.c

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