]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 18:52:04 +0000 (14:52 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 18:52:04 +0000 (14:52 -0400)
commita3dc5f119653a67fd85264ebbc9b377a4e176258
tree5eeb95d847924ec587e5e9a47ea2d2275d37635f
parent023a1ebbbbdec237f952f613c2490966936cd446
parentba46caf7864d87bc0dc0fde5a52aa63511184852
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
net/mac80211/mlme.c
net/mac80211/util.c