git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ccdbb6e b6b561c)

author	John W. Linville <linville@tuxdriver.com>
	Thu, 17 Oct 2013 18:02:07 +0000 (14:02 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 17 Oct 2013 18:02:07 +0000 (14:02 -0400)
commit	9f96da4dd2ccf685b506a21104cb13b1aadd907a
tree	5d9eff61123f096e2434a9d36e6fdbd4cc5c6292	tree \| snapshot
parent	ccdbb6e96beca362db876d820ac1e560ff6d9579	commit \| diff
parent	b6b561c31d51db3dec0cb55412a5d7a1a2397521	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

13 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cmdevt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/wmm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00pci.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/trace.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git