Messages in this thread | | | Date | Fri, 26 Aug 2011 13:47:05 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the net tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/staging/rtl8192e/r8192E_core.c between commit afc4b13df143 ("net: remove use of ndo_set_multicast_list in drivers") from the net tree and commit 09505184ec3d ("staging: rtl8192e: Remove files that are not used") from the staging tree.
The latter removed the file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |