Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Feb 2014 19:34:31 +0000 (14:34 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Feb 2014 19:34:31 +0000 (14:34 -0500)
commit199160bbc9271b9351c062a477699fea72b29e3a
tree226786cda05a6bf0278a9f8d50e2a7445e9c59dd
parent4cfe9a8d58292dc8e32a8093a95187d47507d394
parentfab57a6cc227468ca9e6a4c7ff8d3b10727785ee
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211