diff -Nru ubuntu-drivers-common-0.4.10/debian/changelog ubuntu-drivers-common-0.4.11/debian/changelog
--- ubuntu-drivers-common-0.4.10/debian/changelog	2015-09-03 09:27:36.000000000 +0000
+++ ubuntu-drivers-common-0.4.11/debian/changelog	2015-10-20 09:12:45.000000000 +0000
@@ -1,3 +1,14 @@
+ubuntu-drivers-common (1:0.4.11) wily; urgency=medium
+
+  * gpu-manager.c:
+    - Rely on /var/log/syslog to get information about unloaded modules.
+      This should minimise the current slowdown on boot (LP: #1307069).
+    - Switch from intel to modesetting as the default driver on hybrid
+      intel/nvidia systems because of a regression in the intel driver
+      (LP: #1507676).
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 19 Oct 2015 17:35:12 +0200
+
 ubuntu-drivers-common (1:0.4.10) wily; urgency=medium
 
   * debian/tests/system: Drop the nvidia package tests; they are now tested
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/Quirks/__init__.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/Quirks/__init__.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/Quirks/__pycache__/__init__.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/Quirks/__pycache__/__init__.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/Quirks/__pycache__/quirkapplier.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/Quirks/__pycache__/quirkapplier.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/Quirks/__pycache__/quirkinfo.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/Quirks/__pycache__/quirkinfo.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/Quirks/__pycache__/quirkreader.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/Quirks/__pycache__/quirkreader.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/Quirks/quirkapplier.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/Quirks/quirkapplier.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/Quirks/quirkinfo.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/Quirks/quirkinfo.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/Quirks/quirkreader.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/Quirks/quirkreader.pyc differ
diff -Nru ubuntu-drivers-common-0.4.10/share/hybrid/gpu-manager.c ubuntu-drivers-common-0.4.11/share/hybrid/gpu-manager.c
--- ubuntu-drivers-common-0.4.10/share/hybrid/gpu-manager.c	2015-09-03 09:27:36.000000000 +0000
+++ ubuntu-drivers-common-0.4.11/share/hybrid/gpu-manager.c	2015-10-20 09:10:15.000000000 +0000
@@ -705,7 +705,7 @@
         fprintf(log_handle, "grep fake dmesg status %d\n", status);
     }
     else {
-        snprintf(command, sizeof(command), "dmesg | grep -q \"%s: module\"",
+        snprintf(command, sizeof(command), "grep -q \"%s: module\" /var/log/syslog",
                  module);
         status = system(command);
         fprintf(log_handle, "grep dmesg status %d\n", status);
@@ -1078,8 +1078,12 @@
         driver = UXA;
         fprintf(log_handle, "Detected boot parameter to force Intel/UXA\n");
     }
-    else {
+    else if (has_cmdline_option("gpumanager_sna")) {
         driver = SNA;
+        fprintf(log_handle, "Detected boot parameter to force Intel/SNA\n");
+    }
+    else {
+        driver = MODESETTING;
     }
 
     return driver;
@@ -1426,6 +1430,10 @@
                         (istrstr(line, "UXA") == NULL)) {
                         accel_method_matches = false;
                     }
+                    else if ((prime_intel_driver == MODESETTING) &&
+                        (istrstr(line, "None") == NULL)) {
+                        accel_method_matches = false;
+                    }
                     else {
                         x_options_matches += 1;
                     }
@@ -1732,7 +1740,8 @@
 
     switch (prime_intel_driver) {
     case MODESETTING:
-        accel_method = strdup("");
+        /* glamor seems to fail. Set to "none" instead */
+        accel_method = strdup("    Option \"AccelMethod\" \"None\"\n");
         break;
     case UXA:
         accel_method = strdup("    Option \"AccelMethod\" \"UXA\"\n");
@@ -2185,7 +2194,7 @@
                  pattern, fake_dmesg_path);
     }
     else {
-        snprintf(command, sizeof(command), "dmesg | grep %s", pattern);
+        snprintf(command, sizeof(command), "grep %s /var/log/syslog", pattern);
     }
 
     pfile = popen(command, "r");
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/0-test.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/0-test.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/fakesysfs.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/fakesysfs.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/__pycache__/0-test.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/__pycache__/0-test.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/__pycache__/gpu-manager.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/__pycache__/gpu-manager.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/__pycache__/quirkreader-test.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/__pycache__/quirkreader-test.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/__pycache__/settings.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/__pycache__/settings.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/__pycache__/testarchive.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/__pycache__/testarchive.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/__pycache__/ubuntu_drivers.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/__pycache__/ubuntu_drivers.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/quirkreader-test.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/quirkreader-test.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/settings.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/settings.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/testarchive.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/testarchive.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/tests/ubuntu_drivers.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/tests/ubuntu_drivers.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/UbuntuDrivers/__pycache__/detect.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/UbuntuDrivers/__pycache__/detect.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/UbuntuDrivers/__pycache__/__init__.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/UbuntuDrivers/__pycache__/__init__.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/UbuntuDrivers/__pycache__/kerneldetection.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/UbuntuDrivers/__pycache__/kerneldetection.cpython-34.pyc differ
Binary files /tmp/qajVHbl1fQ/ubuntu-drivers-common-0.4.10/UbuntuDrivers/__pycache__/PackageKit.cpython-34.pyc and /tmp/QLxB7PBDQu/ubuntu-drivers-common-0.4.11/UbuntuDrivers/__pycache__/PackageKit.cpython-34.pyc differ