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)
commitd1f10302568221c20628200bc8baa426c55f61c0
tree5eeb95d847924ec587e5e9a47ea2d2275d37635f
parent9b34f40c20111ba658f88e1669598db494be1fbc
parent1724ffbc7439de679d536163e03f54f35574d449
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
net/mac80211/mlme.c
net/mac80211/util.c