linux-next: manual merge of the staging tree with the net tree
From: Stephen Rothwell
Date: Fri Jul 22 2011 - 01:42:47 EST
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et131x_netdev.c between commit 9d846fec22db
("staging: et131x: remove unused prototype et131x_vlan_rx_register") from
the net tree and commit 2e861534ca09 ("staging: et131x: et131x_netdev.c
checkpatch fixes") from the staging tree.
The latter seems to be a superset of the former, so I used the latter.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature