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

author	John W. Linville <linville@tuxdriver.com>
	Tue, 12 Jun 2012 18:25:04 +0000 (14:25 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 12 Jun 2012 18:25:04 +0000 (14:25 -0400)
commit	0440507bbc44149e63bbfb9df730ba3820371904
tree	7275e41aa1aa7e4d19d0503f1c15f07991c1a120	tree \| snapshot
parent	8d242488ce4627dd7e6333caab56df11ea25e239	commit \| diff
parent	7f0d9f430dc99303558adc30a75eef10c43f7bec	commit \| diff

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

John Crispins staging tree

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_4k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_def.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/testmode.c	\|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	\|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history