archive mirror
 help / color / mirror / Atom feed
* linux-next: net tree merge conflict
@ 2008-05-14  5:01 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-05-14  5:01 UTC (permalink / raw)
  To: David Miller; +Cc: John W. Linville, linux-next, Yi Zhu

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

Hi Dave, John,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965-rs.c between commit
6243065d308ab566aa318a8adef853bc0418896d ("iwlwifi: fix compile error
when CONFIG_MAC80211_DEBUGFS is not selected") in the
net-current/wireless-current trees and commit
39e885049d9d5e6a65bb2543f82e136c02c253b5 ("iwlwifi: TLC modifications")
in the net/wireless trees.  I did the obvious fixup.

Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-05-14  5:01 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-14  5:01 linux-next: net tree merge conflict Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).