git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52874a5
3a5a423
)
Merge remote-tracking branch 'mac80211/master' into HEAD
author
Johannes Berg
<johannes.berg@intel.com>
Wed, 19 Jun 2013 16:55:06 +0000
(18:55 +0200)
committer
Johannes Berg
<johannes.berg@intel.com>
Wed, 19 Jun 2013 16:55:12 +0000
(18:55 +0200)
Merge mac80211 to avoid conflicts with the nl80211 attrbuf
changes.
Conflicts:
net/mac80211/iface.c
net/wireless/nl80211.c
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff