]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Apr 2011 19:27:34 +0000 (12:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Apr 2011 19:27:34 +0000 (12:27 -0700)
1  2 
net/core/ethtool.c

Simple merge