Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 18:20:43 +0000 (10:20 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Dec 2010 18:20:43 +0000 (10:20 -0800)
1  2 
drivers/net/sfc/net_driver.h
drivers/net/sfc/nic.c

Simple merge
Simple merge