Hi Dave,
Just a trivial conflict between the version strings in drivers/net/s2io.c
between your tree and Linus'. I kept the later one from Linus' tree.
The commits are f70e550df83f9eb98b342257aa589860630eae41 ("S2io: Version
update for Tx completion patch") in Linus' tree and
cf374a855363ea2ad06a1c08fc513024295334cc ("S2io: Version update for
multiqueue and vlan patches") in yours.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpH0Kc9LqYlC.pgp
Description: PGP signature
