Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Feb 2014 20:37:15 +0000 (15:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Feb 2014 20:40:14 +0000 (15:40 -0500)
commitd421c62e37c9c83496fa721d4f4cd4a6cae82151
tree4df4b31e17998e0b7531deb904959f6af9ad6d26
parent4885c8731a34eecf509822e089ce17bcd9bd4650
parente3685e03b40f5ec7926d9a75bf63467fc4071df9
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211