]> git.openpandora.org Git - pandora-kernel.git/commitdiff
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)
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

Simple merge