tree b071dc0b08138a1f3d54972cc864b556c6995694
parent e33cdac014d50dd9753e1399ae8b0b5cd98d7aa0
parent 899852af60c212bfe9a2fb71d4d9082d2622df5c
author John W. Linville <linville@tuxdriver.com> 1343929778 -0400
committer John W. Linville <linville@tuxdriver.com> 1343929778 -0400

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