git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff40b42 99e9494)
Merge remote-tracking branch 'wireless-next/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Tue, 4 Jun 2013 10:56:01 +0000 (12:56 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 4 Jun 2013 11:02:42 +0000 (13:02 +0200)
Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

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

Trivial merge
Pandora Kernel Repository