Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 17:56:34 +0000 (13:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 17:56:34 +0000 (13:56 -0400)
commit8d6fcbdb4e039544e3f60a909a0cd819f3f68ad9
tree12a4673f9fd75bf1b3485031bf40f80e1a59fad5
parent931cb03afed7b541392295f3afc4638da32f08a0
parent88a9e31c506c00c8b7a2f1611406d0e38dcb33b3
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211