]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 02:44:43 +0000 (12:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 02:44:43 +0000 (12:44 +1000)
commita9def733f2299adda83bc67988e1a3b1631f8e53
treec830773b6a2fbc0af72a16ca4b34a5ce25294705
parent8b198111617aa0f78cf0baf6a88330b5963ac7cf
parent24de851b79a414f0e1813eb131a7d90849cc22c2
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
MAINTAINERS
drivers/net/wireless/iwlwifi/mvm/time-event.c
drivers/net/wireless/iwlwifi/pcie/rx.c
drivers/net/wireless/iwlwifi/pcie/trans.c
include/linux/ieee80211.h
include/net/cfg80211.h
include/net/mac80211.h
net/wireless/nl80211.c