tree 2d0913749141e9e8e0df774426a658b52fddabbf
parent 0f496df2d9ba48faa808b5fa330de0da1a2d29d7
parent 3b4797bce0050570e84bedd10e1b14e9320a3551
author John W. Linville <linville@tuxdriver.com> 1359573739 -0500
committer John W. Linville <linville@tuxdriver.com> 1359573739 -0500

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next