projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4d57c67
6623c60
)
Merge remote-tracking branch 'net-next/master' into mac80211-next
author
Johannes Berg
<johannes.berg@intel.com>
Tue, 13 Oct 2015 08:28:16 +0000
(10:28 +0200)
committer
Johannes Berg
<johannes.berg@intel.com>
Tue, 13 Oct 2015 08:28:43 +0000
(10:28 +0200)
Merge net-next to get some driver changes that patches depend
on (in order to avoid conflicts).
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Trivial merge