git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a4ed534 7ce8c7a)
Merge remote-tracking branch 'mac80211/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 6 Sep 2012 13:55:50 +0000 (15:55 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 6 Sep 2012 13:56:02 +0000 (15:56 +0200)
commit944b9e375d89271c39995d363f62cb91734fae5f
treebd6014bd0be251cdf2b32b12ca8a62e55742c0eetree | snapshot
parenta4ed53466a289a4139405bf7190c78a8e9d8debfcommit | diff
parent7ce8c7a3433c6d6f4adfec0611d250782f0b4b0ccommit | diff
Merge remote-tracking branch 'mac80211/master' into mac80211-next

Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.

Conflicts:
drivers/net/wireless/mac80211_hwsim.c

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c diff1 | diff2 | blob | history
include/net/cfg80211.h diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/mesh.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/scan.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/wireless/reg.c diff1 | diff2 | blob | history
Pandora Kernel Repository