git.agner.ch Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 769162e 36eb22e)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 20 Jul 2012 16:30:48 +0000 (12:30 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 20 Jul 2012 16:30:48 +0000 (12:30 -0400)
commit	90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857
tree	9b1d8ca6084012a02b302520bc26e5be65ba7b2a	tree \| snapshot
parent	769162e38b91e1d300752e666260fa6c7b203fbc	commit \| diff
parent	36eb22e97a2b621fb707eead58ef915ab0f46e9e	commit \| diff

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

15 files changed:

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_cmdresp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel tree with some unpolished code for Colibri/Apalis modules