git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b285109 b26f5f0)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 8 Feb 2013 18:16:17 +0000 (13:16 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 8 Feb 2013 18:16:17 +0000 (13:16 -0500)
commit	f5237f278f30a92401539a54f87ee0c717b6f818
tree	209d4fd6fb00e660c76ca8ac5d4caed59dbb9957	tree \| snapshot (tar.gz zip)
parent	b285109dde7b873b5dc671ef1b3ae3090f4bc72f	commit \| diff
parent	b26f5f09ebdeb85ab152344cc1d6d484a3ce967d	commit \| diff

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

16 files changed:

drivers/bcma/bcma_private.h	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_chipcommon_nflash.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-fw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/11n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/spi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/wlcore_i.h	diff1 \|	diff2 \|	blob \| history
drivers/ssb/main.c	diff1 \|	diff2 \|	blob \| history
include/linux/bcma/bcma_driver_chipcommon.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history