tree 0e831639cd6449c2955234cfc37ef46481c788d1
parent e4cb3ff9311e0817e65cda7bc53898348aab7527
parent ec816087e8978b74c1bd5fae0e335dd97d964e9f
author John W. Linville <linville@tuxdriver.com> 1353959201 -0500
committer John W. Linville <linville@tuxdriver.com> 1353959201 -0500

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