tree 302f2f1c7cd7c370719fe5a69371c1f5a6a87157
parent a4881cc45a3fab4488e16c4934e149cfa620f1a9
parent 768be59f30f2ee8958ba3718101162c694efab12
author John W. Linville <linville@tuxdriver.com> 1347043786 -0400
committer John W. Linville <linville@tuxdriver.com> 1347043786 -0400

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