Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 18:14:48 +0000 (14:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Oct 2012 18:14:48 +0000 (14:14 -0400)
commitefec22b4689bbfdbed26367219e981fcc946b9a6
treeeee6bb1c6109dd52e4bb6113ab61ad8d5dfa8047
parentf89ff6441df06abc2d95f3ef67525923032d6283
parent6dbda2d00d466225f9db1dc695ff852443f28832
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211
net/mac80211/util.c