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

diff --cc queue-3.10/series
index 03ce31f08617de106e3b5282481f44e780c22de7,de0e46c22ec1b5917ac08a929788862f5a6ad6e7..3a23b65421f9dd71f52fcd849778ad157214a65d
--- 1/queue-3.10/series
--- 2/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 f04d7ab62862a53942948dbeb80acebaebf762f8,dcc1af38dc2370b97c972ef5cc5889cb29499cc4..ae74e627bfbfdfe88cd3d1b9c1bf1844739d86b7
--- 1/queue-3.11/series
--- 2/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 36d06f5722d9313387e287316f31ceb78b2c2c9f,47a27358241aa0d2dfa8df9b0fdeebffca3a5dea..da15e23a49f78165e755b8250e9f85b7378c6a66
--- 1/queue-3.12/series
--- 2/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