git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4ed534 7ce8c7a)
Merge remote-tracking branch 'mac80211/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 6 Sep 2012 13:55:50 +0000 (15:55 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 6 Sep 2012 13:56:02 +0000 (15:56 +0200)
Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.

Conflicts:
drivers/net/wireless/mac80211_hwsim.c

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

Trivial merge
Pandora Kernel Repository