git.openwrt.org Git - openwrt/staging/blogic.git/commit

author	John W. Linville <linville@tuxdriver.com>
	Mon, 28 Jan 2013 19:43:00 +0000 (14:43 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 28 Jan 2013 19:43:00 +0000 (14:43 -0500)
commit	4205e6ef4ee747aa81930537b6035086ba5f1e28
tree	b2ebe2b4621f5f531f283cb9bf0005cd3c04ca7b	tree \| snapshot
parent	cef401de7be8c4e155c6746bfccf721a4fa5fab9	commit \| diff
parent	9ebea3829fac7505e0cd2642fbd13cfa9c038831	commit \| diff

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

John Crispins staging tree

drivers/bcma/bcma_private.h	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_pci_host.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/nfc/pn544/i2c.c	diff1 \|	diff2 \|	blob \| history
include/linux/bcma/bcma_driver_pci.h	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