]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Feb 2011 18:21:36 +0000 (10:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Feb 2011 18:21:36 +0000 (10:21 -0800)
1  2 
net/core/dev.c

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