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

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f473832 2c4db12)

author	John W. Linville <linville@tuxdriver.com>
	Thu, 10 Jul 2014 21:00:24 +0000 (17:00 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 10 Jul 2014 21:00:24 +0000 (17:00 -0400)
commit	5c4d5e816c2cc86e17d09677b649be47fbc30e51
tree	b13327e59b6ea29095b9b33b4cdd5dffab9a66d3	tree \| snapshot
parent	f473832fece16611520bf54ad52b16c3f6db0a94	commit \| diff
parent	2c4db12ec469b9fcdad9f6bfd6fa20e65a563ac5	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

17 files changed:

drivers/net/wireless/b43/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/11n_aggr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.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/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/tdls.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/uap_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/util.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00mac.c	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