tree fb34518864993d199239ef35a1137102b6fa1a73
parent 4da2a54a842db6921289e3e25b0739531a594dea
parent ed405be5cb5e8e494e8dcd83b6eb1add34dc752a
author John W. Linville <linville@tuxdriver.com> 1370289337 -0400
committer John W. Linville <linville@tuxdriver.com> 1370289337 -0400

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