]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mac80211' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 20 Oct 2014 14:41:33 +0000 (16:41 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 20 Oct 2014 19:39:29 +0000 (21:39 +0200)
commit3b4e5fc91fb693ac8e384be6683ed332280334c5
tree01b6138e17581a27d62e71a013bb85638abd9a7a
parent0be8ce98583dee359a4e1b30515039e0c7d03f65
parent871a4b0ebb706502c8e531cff18796ab0c1ec78e
Merge branch 'mac80211' into mac80211-next

This was needed to avoid conflicts in the minstrel changes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c
net/wireless/nl80211.c