lkml.org 
[lkml]   [2010]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging tree with the wireless tree
On Mon, Feb 22, 2010 at 04:31:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c between commit
> e2117cea27c6b27e1a379acac5eb0433eeb7033a ("staging: rtl8192su: fix
> compile error from wireless-testing commit") from the wireless tree and
> commit 7332868b1aea2a5900a70acadf767f7632b1c2c2 ("Staging: rtl8187x: Use %
> pM for mac address output") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> as necessary.

Looks good to me, thanks for doing this.

greg k-h


\
 
 \ /
  Last update: 2010-02-24 04:39    [W:0.039 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site