git.karo-electronics.de Git - linux-beck.git/commit

]> git.karo-electronics.de Git - linux-beck.git/commit

author	John W. Linville <linville@tuxdriver.com>
	Wed, 28 Aug 2013 14:36:09 +0000 (10:36 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 28 Aug 2013 14:36:09 +0000 (10:36 -0400)
commit	b35c809708ad245a36bef94d6fb1e83f6ab850aa
tree	c6dc6580546c9a5997eae06c8409f986c383d2a4	tree \| snapshot
parent	6e956da2027c767859128b9bfef085cf2a8e233b	commit \| diff
parent	19c361608ce3e73f352e323262f7e0a8264be3af	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
net/mac80211/ibss.c

12 files changed:

Beck SC1x5 Kernel

RSS Atom

drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/4965-mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/time-event.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1201.c	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rc80211_minstrel_ht.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history