]> 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)
commitcebad8fdcbe058163cf9c88022b761dc434917c7
tree5eeb95d847924ec587e5e9a47ea2d2275d37635f
parent5b2ecd914a3668924959960f560520f7cc6a4956
parentc6f85a7fc861eeed04b577e989f08bd7bbf59d3d
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