Subject: linux-next: manual merge of the tip tree with the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 25 Jul 2014 14:38:15 +1000

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/net/wireless/ath/ath9k/hw.c between commit 8d7e09dda821
("ath9k: save tsf in channel context") from the net-next tree and
commit 6438e0ddc870 ("wireless: ath9k: Get rid of timespec
conversions") from the tip tree.

The former changes made the latter conversions much harder, so I
effectively dropped the tip tree commit.  Please discuss with the
wireless maintainer ...

-- 
Cheers,
Stephen Rothwell                    [email-masked]