Merge remote-tracking branch 'remotes/linux/linux-3.0.y' into mr1-linux
Revert "net: wireless: bcmdhd: Enable P2P probe request handling only during discovery"

This reverts commit 62897416be271f76b22415be684c0b884947ce25.