net: merge fixup for qlge_main
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jan 2010 14:13:13 +0000 (06:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Jan 2010 14:13:13 +0000 (06:13 -0800)
commitce96bc86bf2ee12e8a3bf461ca8027557c1ef42f
tree7bc59ed51a9517ec39fb6e63f9a92c435f0e5e99
parent05ba712d7eb156009753e18e5116cabd869cc6e2
net: merge fixup for qlge_main

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/qlge/qlge_main.c