Resolve conflict
[platform/upstream/libpcap.git] / ieee80211.h
2012-11-04 Anas NashifImported Upstream version 1.3.0 upstream/1.3.0