git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ec596c c3eee1f)
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 10 Jun 2015 10:44:58 +0000 (12:44 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 10 Jun 2015 10:45:09 +0000 (12:45 +0200)
Merge back net-next to get wireless driver changes (from Kalle)
to be able to create the API change across all trees properly.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Trivial merge
Pandora Kernel Repository