]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:39:53 +0000 (14:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:39:53 +0000 (14:39 -0400)
commitff6de71a414b3fab86af52edf5f0dbdbde2f8b3e
tree04ab3567c3bea31503c4dfa94909f99dc4b3789f
parent8d8e5c2fda720e1666b4ab9a4c38a369a3f9a61e
parent58a0a8f215ee7b65965b877f3fffcc7e09c635d5
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
net/mac80211/cfg.c
net/mac80211/mlme.c