git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	John W. Linville <linville@tuxdriver.com>
	Mon, 18 Feb 2013 18:47:13 +0000 (13:47 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 18 Feb 2013 18:47:13 +0000 (13:47 -0500)
commit	3b9615d511a5a73563279dbf085d0f2906094fd5
tree	99870656d835fc6c12093bc67517956cc7b3d6ec	tree \| snapshot
parent	dc9940981f0bb2f1cdc1fa9218d26f6ba97de8b4	commit \| diff
parent	ad04d279b0283d0d0788d014d0827dd2caa9889e	commit \| diff

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

Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c

17 files changed:

drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/wil6210/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rndis_wlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/wlcore_i.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlan-ng/cfg80211.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sysfs.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/wil6210/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rndis_wlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/wlcore_i.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlan-ng/cfg80211.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sysfs.c	diff1 \|	diff2 \|	blob \| history