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)
commitcf78f8ee3de7d8d5b47d371c95716d0e4facf1c4
treeffd211dfe1d4f0d91fe10396b05e261865f62b61
parent1e13f863ca88014d9550876c05c939fdab1017d1
parentc39d35ebffeea5996a6f8fd8430fae9acfb8aeaf
Merge branch 'for-davem' of git://git./linux/kernel/git/bwh/sfc-next-2.6
drivers/net/sfc/net_driver.h
drivers/net/sfc/nic.c