]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 89250f5 b5e3832)
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)
commit316c3811c07774af8c8245ebdd4a474b89cefdad
treebd6014bd0be251cdf2b32b12ca8a62e55742c0eetree | snapshot
parent89250f506eb29dcc0e1099d9a0491ad197ea0237commit | diff
parentb5e383215ab2ea52b5a6f64051b9291691b084bfcommit | 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
Linux Kernel Source Tree.