tree 85d5712c76db733408d94544fd22ba08678c3b1a
parent 9767226d8e6a1adaa33beb9f517ef40dddfa460c
author Dmitry Shmidt <dimitrysh@google.com> 1391539836 -0800
committer Dmitry Shmidt <dimitrysh@google.com> 1391539929 -0800

Cumulative patch from commit a05e236b11bfb4dacfc269938181104a6303247c

a05e236 P2P: Do not re-start invitation on Probe Req RX if already ack'ed
e8a1572 The hostap.git master branch is now used for 2.2 development
94ff22e Remove dead code from AP setup
0b5ff2a WPS: Remove unused Credential AP Channel processing
1536cb5 WPS: Remove unused 802.1X attribute parsing and processing
b37d582 Replace ieee802_11_print_ssid() with wpa_ssid_txt()
93ee302 Change version information for the 2.1 release
44f967c Update ChangeLog files to match current implementation

Change-Id: If2602b7bd484c957652d72b9bd80a3d830392fd5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>