Messages in this thread | | | Date | Tue, 12 Jun 2012 11:31:48 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the wireless-next tree with the net tree |
| |
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in MAINTAINERS between commit ce466579b1c9 ("wireless: add my new trees to MAINTAINERS") from the net tree and commit 491b26b40222 ("wireless: update wireless URLs") from the wireless-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc MAINTAINERS index f6e62de,c5fd905..0000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -4351,9 -4339,8 +4351,9 @@@ F: arch/m68k/hp300 MAC80211 M: Johannes Berg <johannes@sipsolutions.net> L: linux-wireless@vger.kernel.org - W: http://linuxwireless.org/ + W: http://wireless.kernel.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git S: Maintained F: Documentation/networking/mac80211-injection.txt F: include/net/mac80211.h @@@ -4363,9 -4350,8 +4363,9 @@@ MAC80211 PID RATE CONTRO M: Stefano Brivio <stefano.brivio@polimi.it> M: Mattias Nissler <mattias.nissler@gmx.de> L: linux-wireless@vger.kernel.org - W: http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID + W: http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID -T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git S: Maintained F: net/mac80211/rc80211_pid* [unhandled content-type:application/pgp-signature] | |