tree e54cec9fa8ed9cd0e75d649d08fa628c3f258dcd
parent 1340decc0f511c0bd82b27b08e45318ec093a93d
parent ca68a8b561c48393c8ba25055ce294caaa3ac008
author Denton Gentry <dgentry@google.com> 1429770151 -0700
committer Denton Gentry <dgentry@google.com> 1429770151 -0700

Merge hostapd upstream into master.

Current as of:
http://w1.fi/cgit/hostap/commit/?id=ca68a8b561c48393c8ba25055ce294caaa3ac008

Note that this resolves the merge conflicts, but does not compile.
A second commit on top of this one is needed to get a working hostapd.

Change-Id: Ib1f533ef8f3399aaec7d4bc6708f7ea126a2c39c