tree 5b73cea04b13c888d94e29000c0a66ed2c23980f
parent 5ea276963eacbef742fe4854883c0f69c903fcfd
parent 371a255e863857f988a91a3850d6feeaa4f3c536
author John W. Linville <linville@tuxdriver.com> 1340735254 -0400
committer John W. Linville <linville@tuxdriver.com> 1340735254 -0400

Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next