git.osdn.net Git - android-x86/kernel.git/commit

(root) / android-x86 / kernel.git / commit

author	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
	Tue, 20 Jan 2015 07:23:27 +0000 (09:23 +0200)
committer	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
	Thu, 22 Jan 2015 15:55:12 +0000 (17:55 +0200)
commit	d5234cb2f4d2bc15d088dac17d02260d2613be28
tree	091da929d43c132604bdac188067b67eb3854e7e	tree \| snapshot
parent	bd1ba664147ae271e592aa90266cf9aba6efe116	commit \| diff
parent	2cee4762c528a9bd2cdff793197bf591a2196c11	commit \| diff

Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/iwl-fw-file.h
drivers/net/wireless/iwlwifi/mvm/scan.c

kernel

RSS Atom

About OSDN

Site Announce
About OSDN
Privacy
Terms of Use
Advertise

Find Software

Search
Find by Categories
Download Ranking
Project Ranking

Develop Software

Create Project/Chamber
What's new
Recently Registered Project
Chambers Map
API

Help

Help Docs
Contact Us
Report Abuse/spam

drivers/net/wireless/iwlwifi/iwl-7000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-8000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-fw-file.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/utils.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history