Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Dec 2013 18:20:03 +0000 (13:20 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Dec 2013 18:20:03 +0000 (13:20 -0500)
commita59b40b30f3f51bf5c56c15a7dc4da11b424a34b
tree42528df41174b170cd30aa1da23e597fe6f43429
parent019b952843673fa6616d73335b9c27acb43ddeff
parent0834ae3c3af44480834cce128b6fef83006e537f
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211