Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Jun 2013 18:50:44 +0000 (14:50 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Jun 2013 18:50:44 +0000 (14:50 -0400)
commit2f2a8846d51ed7342603a8d7c196fcc9e2f8a319
tree16fc241ce3b45e787dad98fbf4e79ab790519c0a
parentfcb3701849957917a234a61b58ad70ed35c83eda
parent3a5a423bb958ad22eeccca66c533e85bf69ba10e
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211