diff options
| author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2015-07-07 17:46:00 +0200 |
|---|---|---|
| committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2015-07-07 17:46:00 +0200 |
| commit | a40522c2edb3e29d1b3c3110f26d2db6cdd3aaed (patch) | |
| tree | 6af8c085499a15941e35aa98c8a731e402418a68 | |
| parent | 7e4e6c1f17a0b502448605588b4ddbdc0090d81e (diff) | |
cherry-pick commits 3870 to 3873 from trunk
| -rw-r--r-- | jobs/suspend.txt.in | 2 | ||||
| -rw-r--r-- | whitelists/hwsubmit.whitelist | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in index 4e10c62..13c92c6 100644 --- a/jobs/suspend.txt.in +++ b/jobs/suspend.txt.in @@ -807,6 +807,7 @@ estimated_duration: 1.2 requires: device.category == 'WIRELESS' environment.ROUTERS == 'multiple' + IEEE_80211.ac == 'supported' user: root environ: WPA_AC_SSID WPA_AC_PSK command: @@ -829,6 +830,7 @@ estimated_duration: 1.2 requires: device.category == 'WIRELESS' environment.ROUTERS == 'multiple' + IEEE_80211.ac == 'supported' user: root environ: OPEN_AC_SSID command: diff --git a/whitelists/hwsubmit.whitelist b/whitelists/hwsubmit.whitelist index 56c4d72..218bd1d 100644 --- a/whitelists/hwsubmit.whitelist +++ b/whitelists/hwsubmit.whitelist @@ -11,6 +11,7 @@ package uname usb __info__ +info/buildstamp cpuinfo_attachment dmesg_attachment dmi_attachment |