From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 26 Nov 2013 16:07:57 +0000 (-0800)
Subject: Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue
X-Git-Tag: v3.11.10~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=247fb7e929b02c94ffcea3e9dd3560fa5bbe0168;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue
---

247fb7e929b02c94ffcea3e9dd3560fa5bbe0168
diff --cc queue-3.10/series
index 03ce31f0861,de0e46c22ec..3a23b65421f
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@@ -17,4 -17,7 +17,8 @@@ sched-idle-fix-the-idle-polling-state-l
  pci-allow-pcie-capability-link-related-register-access-for-switches.patch
  pci-remove-pcie-capability-version-checks.patch
  pci-support-pcie-capability-slot-registers-only-for-ports-with-slots.patch
 +perf-ftrace-fix-paranoid-level-for-enabling-function-tracer.patch
+ acpi-ec-ensure-lock-is-acquired-before-accessing-ec-struct-members.patch
+ acpi-video-quirk-initial-backlight-level-0.patch
+ acpi-hotplug-fix-handle_root_bridge_removal.patch
+ acpi-hotplug-do-not-execute-insert-in-progress-_ost.patch
diff --cc queue-3.11/series
index f04d7ab6286,dcc1af38dc2..ae74e627bfb
--- a/queue-3.11/series
+++ b/queue-3.11/series
@@@ -19,4 -19,7 +19,8 @@@ sched-idle-fix-the-idle-polling-state-l
  pci-allow-pcie-capability-link-related-register-access-for-switches.patch
  pci-remove-pcie-capability-version-checks.patch
  pci-support-pcie-capability-slot-registers-only-for-ports-with-slots.patch
 +perf-ftrace-fix-paranoid-level-for-enabling-function-tracer.patch
+ acpi-ec-ensure-lock-is-acquired-before-accessing-ec-struct-members.patch
+ acpi-video-quirk-initial-backlight-level-0.patch
+ acpi-hotplug-fix-handle_root_bridge_removal.patch
+ acpi-hotplug-do-not-execute-insert-in-progress-_ost.patch
diff --cc queue-3.12/series
index 36d06f5722d,47a27358241..da15e23a49f
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@@ -17,4 -17,7 +17,8 @@@ drm-nvc0-gr-fix-a-number-of-missing-exp
  thinkpad_acpi-fix-build-error-when-config_snd_max_cards-32.patch
  arm-omap2-hwmod-check-for-module-address-space-during-init.patch
  sched-idle-fix-the-idle-polling-state-logic.patch
 +perf-ftrace-fix-paranoid-level-for-enabling-function-tracer.patch
+ acpi-ec-ensure-lock-is-acquired-before-accessing-ec-struct-members.patch
+ acpi-video-quirk-initial-backlight-level-0.patch
+ acpi-hotplug-fix-handle_root_bridge_removal.patch
+ acpi-hotplug-do-not-execute-insert-in-progress-_ost.patch