tree 2ae08acbb26ddb2fa662db63c1dd111c0b5b646f
parent 6ddcd46463aa66855f1f8e74de454740a5f4aef4
parent 79543d8eecc0957ac6fe3ec1e2486ad31d4b67a3
author John W. Linville <linville@tuxdriver.com> 1339610740 -0400
committer John W. Linville <linville@tuxdriver.com> 1339610740 -0400

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