Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Dec 2013 18:32:20 +0000 (13:32 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Dec 2013 18:32:20 +0000 (13:32 -0500)
commitb6a15802eee2dd8d401f5f89af31804f5a77f429
tree213e6db3ececae54a6c61ccfe256ac3513cc8a3b
parentbbf807bc0697e577c137a5fffb30fca7c6a45da1
parentbd02cd2549cfcdfc57cb5ce57ffc3feb94f70575
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211