tree d8fb187da3f8caca8c4557b76b5b4fe6f85348b5
parent 0eeb315b20774296f977cecf0010794cd690c594
parent fa8f136fe9a8fbdcb11a1db94f30146cae6d8777
author John W. Linville <linville@tuxdriver.com> 1406134874 -0400
committer John W. Linville <linville@tuxdriver.com> 1406134874 -0400

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