git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa44b98
1e359a5
)
Merge branch 'mac80211' into mac80211-next
author
Johannes Berg
<johannes.berg@intel.com>
Wed, 7 Jan 2015 13:39:02 +0000
(14:39 +0100)
committer
Johannes Berg
<johannes.berg@intel.com>
Wed, 7 Jan 2015 13:39:16 +0000
(14:39 +0100)
Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff