diff options
author | Ben Hutchings <benh@debian.org> | 2012-12-19 00:18:25 +0000 |
---|---|---|
committer | Ben Hutchings <benh@debian.org> | 2012-12-19 00:18:25 +0000 |
commit | ebda0262bde428434d24e5a9d10fc3c10705aa02 (patch) | |
tree | 3e84e672e6ef1830936970a99a89f0f80a25d822 | |
parent | 16abce380441f99fcd961410c70f62420f51cadb (diff) | |
download | kernel_replicant_linux-ebda0262bde428434d24e5a9d10fc3c10705aa02.tar.gz kernel_replicant_linux-ebda0262bde428434d24e5a9d10fc3c10705aa02.tar.bz2 kernel_replicant_linux-ebda0262bde428434d24e5a9d10fc3c10705aa02.zip |
Update to 3.7.1
svn path=/dists/trunk/linux/; revision=19619
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | debian/patches/bugfix/x86/ACPI-video-ignore-BIOS-initial-backlight-value-for-H.patch | 49 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 51 deletions
diff --git a/debian/changelog b/debian/changelog index 72ede20f5444..f4af00d70556 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -linux (3.7-1~experimental.1) UNRELEASED; urgency=low +linux (3.7.1-1~experimental.1) UNRELEASED; urgency=low * New upstream release: http://kernelnewbies.org/Linux_3.7 + * New upstream stable update: + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.7.1 [ maximilian attems ] * Enable WIZNET_W5100, WIZNET_W5300, AMD_PHY, BCM87XX_PHY. diff --git a/debian/patches/bugfix/x86/ACPI-video-ignore-BIOS-initial-backlight-value-for-H.patch b/debian/patches/bugfix/x86/ACPI-video-ignore-BIOS-initial-backlight-value-for-H.patch deleted file mode 100644 index 37eb140c3208..000000000000 --- a/debian/patches/bugfix/x86/ACPI-video-ignore-BIOS-initial-backlight-value-for-H.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Zhang Rui <rui.zhang@intel.com> -Date: Tue, 4 Dec 2012 23:30:19 +0100 -Subject: ACPI / video: ignore BIOS initial backlight value for HP Folio - 13-2000 - -commit 129ff8f8d58297b04f47b5d6fad81aa2d08404e1 upstream. - -Or else the laptop will boot with a dimmed screen. - -References: https://bugzilla.kernel.org/show_bug.cgi?id=51141 -Tested-by: Stefan Nagy <public@stefan-nagy.at> -Signed-off-by: Zhang Rui <rui.zhang@intel.com> -Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> ---- - drivers/acpi/video.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index 0230cb6..ac9a69c 100644 ---- a/drivers/acpi/video.c -+++ b/drivers/acpi/video.c -@@ -389,6 +389,12 @@ static int __init video_set_bqc_offset(const struct dmi_system_id *d) - return 0; - } - -+static int video_ignore_initial_backlight(const struct dmi_system_id *d) -+{ -+ use_bios_initial_backlight = 0; -+ return 0; -+} -+ - static struct dmi_system_id video_dmi_table[] __initdata = { - /* - * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121 -@@ -433,6 +439,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720"), - }, - }, -+ { -+ .callback = video_ignore_initial_backlight, -+ .ident = "HP Folio 13-2000", -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13 - 2000 Notebook PC"), -+ }, -+ }, - {} - }; - diff --git a/debian/patches/series b/debian/patches/series index 79b9e08fecd9..a6f2fb8b35b9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -57,7 +57,6 @@ features/all/xen/microcode-typo.patch bugfix/all/firmware_class-log-every-success-and-failure.patch bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch -bugfix/x86/ACPI-video-ignore-BIOS-initial-backlight-value-for-H.patch bugfix/all/exec-do-not-leave-bprm-interp-on-stack.patch bugfix/all/exec-use-ELOOP-for-max-recursion-depth.patch bugfix/all/megaraid_sas-fix-memory-leak-if-SGL-has-zero-length-entries.patch |