lkml.org 
[lkml]   [2011]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the moduleh tree with the staging tree
Hi Paul,

Today's linux-next merge of the moduleh tree got conflicts in
drivers/staging/brcm80211/brcmfmac/bcmsdh.c,
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c,
drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c between commit fc2d6e573be6
("staging: brcm80211: remove brcm80211 driver from the staging tree")
from the staging tree and commits from the moduleh tree.

The former removed the files, 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]
\
 
 \ /
  Last update: 2011-10-13 08:23    [W:0.027 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site