From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 11 Oct 2013 00:05:17 +0000 (-0700)
Subject: Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue
X-Git-Tag: v3.0.100~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee624d2d5fc2e499d4f8633b932c7360a5c84329;p=thirdparty%2Fkernel%2Fstable-queue.git

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

ee624d2d5fc2e499d4f8633b932c7360a5c84329
diff --cc queue-3.0/series
index 49e752d0ed3,e2af7871670..a82cf84d0da
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@@ -28,5 -28,10 +28,12 @@@ sparc64-fix-not-sra-ed-o5-in-32-bit-tra
  sparc32-fix-exit-flag-passed-from-traced-sys_sigreturn.patch
  kernel-kmod.c-check-for-null-in-call_usermodehelper_exec.patch
  usb-serial-option-ignore-card-reader-interface-on-huawei-e1750.patch
 +rtlwifi-align-private-space-in-rtl_priv-struct.patch
 +p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch
+ staging-comedi-ni_65xx-bug-fix-confine-insn_bits-to-one-subdevice.patch
+ acpi-ipmi-fix-atomic-context-requirement-of-ipmi_msg_handler.patch
+ tile-use-a-more-conservative-__my_cpu_offset-in-config_preempt.patch
+ btrfs-change-how-we-queue-blocks-for-backref-checking.patch
+ ext4-avoid-hang-when-mounting-non-journal-filesystems-with-orphan-list.patch
+ tg3-fix-length-overflow-in-vpd-firmware-parsing.patch
+ tools-hv-verify-origin-of-netlink-connector-message.patch
diff --cc queue-3.10/series
index 6c7a6d84ffb,2df2151e138..530fc1286d4
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@@ -81,13 -81,21 +81,30 @@@ mwifiex-fix-null-pointer-dereference-in
  mwifiex-fix-hang-issue-for-usb-chipsets.patch
  mwifiex-fix-pcie-hs_cfg-cancel-cmd-timeout.patch
  usb-serial-option-ignore-card-reader-interface-on-huawei-e1750.patch
 +xen-hvc-allow-xenboot-console-to-be-used-again.patch
 +ib_srpt-destroy-cm_id-before-destroying-qp.patch
 +ib_srpt-always-set-response-for-task-management.patch
 +rtlwifi-align-private-space-in-rtl_priv-struct.patch
 +p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch
 +mm-avoid-reinserting-isolated-balloon-pages-into-lru-lists.patch
 +iscsi-target-only-perform-wait_for_tasks-when-performing-shutdown.patch
 +net-update-the-sysctl-permissions-handler-to-test-effective-uid-gid.patch
 +irq-force-hardirq-exit-s-softirq-processing-on-its-own-stack.patch
 +can-flexcan-fix-flexcan_chip_start-on-imx6.patch
+ revert-drm-radeon-add-missing-hdmi-callbacks-for-rv6xx.patch
+ dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch
+ dmaengine-imx-dma-fix-callback-path-in-tasklet.patch
+ dmaengine-imx-dma-fix-slow-path-issue-in-prep_dma_cyclic.patch
+ acpi-ipmi-fix-atomic-context-requirement-of-ipmi_msg_handler.patch
+ xfs-fix-node-forward-in-xfs_node_toosmall.patch
+ drm-nouveau-bios-init-stub-opcode-0xaa.patch
 -irq-force-hardirq-exit-s-softirq-processing-on-its-own-stack.patch
+ alsa-hda-fix-gpio-for-acer-aspire-3830tg.patch
+ tile-use-a-more-conservative-__my_cpu_offset-in-config_preempt.patch
+ s390-fix-system-call-restart-after-inferior-call.patch
+ btrfs-change-how-we-queue-blocks-for-backref-checking.patch
+ btrfs-skip-subvol-entries-when-checking-if-we-ve-created-a-dir-already.patch
+ btrfs-remove-ourselves-from-the-cluster-list-under-lock.patch
+ hid-roccat-add-support-for-konepureoptical-v2.patch
+ hid-uhid-add-devname-module-alias.patch
+ hid-uhid-allocate-static-minor.patch
+ net-qmi_wwan-add-new-qualcomm-devices.patch
diff --cc queue-3.11/series
index 432ae119f77,8eda106291e..b39624b8880
--- a/queue-3.11/series
+++ b/queue-3.11/series
@@@ -100,14 -100,26 +100,36 @@@ mwifiex-fix-hang-issue-for-usb-chipsets
  mwifiex-fix-pcie-hs_cfg-cancel-cmd-timeout.patch
  usb-chipidea-add-intel-clovertrail-pci-id.patch
  usb-serial-option-ignore-card-reader-interface-on-huawei-e1750.patch
 +xen-hvc-allow-xenboot-console-to-be-used-again.patch
 +ib_srpt-destroy-cm_id-before-destroying-qp.patch
 +ib_srpt-always-set-response-for-task-management.patch
 +rtlwifi-align-private-space-in-rtl_priv-struct.patch
 +p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch
 +mm-avoid-reinserting-isolated-balloon-pages-into-lru-lists.patch
 +iscsi-target-only-perform-wait_for_tasks-when-performing-shutdown.patch
 +net-update-the-sysctl-permissions-handler-to-test-effective-uid-gid.patch
 +irq-force-hardirq-exit-s-softirq-processing-on-its-own-stack.patch
 +can-flexcan-fix-flexcan_chip_start-on-imx6.patch
 +drm-radeon-fix-hdmi-callbacks-for-rv6xx-incorrectly-added-to-r520.patch
+ dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch
+ dmaengine-imx-dma-fix-callback-path-in-tasklet.patch
+ dmaengine-imx-dma-fix-slow-path-issue-in-prep_dma_cyclic.patch
+ acpi-ipmi-fix-atomic-context-requirement-of-ipmi_msg_handler.patch
+ xfs-fix-node-forward-in-xfs_node_toosmall.patch
+ drm-nouveau-bios-init-stub-opcode-0xaa.patch
 -irq-force-hardirq-exit-s-softirq-processing-on-its-own-stack.patch
+ arm-tegra-unify-tegra-s-kconfig-a-bit-more.patch
+ alsa-hda-fix-gpio-for-acer-aspire-3830tg.patch
+ arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch
+ hid-wiimote-fix-ff-deadlock.patch
+ mmc-fix-null-pointer-use-in-mmc_blk_remove_req.patch
+ tile-use-a-more-conservative-__my_cpu_offset-in-config_preempt.patch
+ s390-fix-system-call-restart-after-inferior-call.patch
+ btrfs-reset-ret-in-record_one_backref.patch
+ btrfs-change-how-we-queue-blocks-for-backref-checking.patch
+ btrfs-skip-subvol-entries-when-checking-if-we-ve-created-a-dir-already.patch
+ btrfs-remove-ourselves-from-the-cluster-list-under-lock.patch
+ hid-roccat-add-support-for-konepureoptical-v2.patch
+ hid-add-holtek-usb-id-04d9-a081-sharkoon-darkglider.patch
+ hid-uhid-add-devname-module-alias.patch
+ hid-uhid-allocate-static-minor.patch
+ net-qmi_wwan-add-new-qualcomm-devices.patch
diff --cc queue-3.4/series
index efc249a0f5c,0b157bd659b..09b434e73d2
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@@ -33,8 -33,12 +33,17 @@@ sparc64-fix-not-sra-ed-o5-in-32-bit-tra
  sparc32-fix-exit-flag-passed-from-traced-sys_sigreturn.patch
  kernel-kmod.c-check-for-null-in-call_usermodehelper_exec.patch
  usb-serial-option-ignore-card-reader-interface-on-huawei-e1750.patch
 +ib_srpt-destroy-cm_id-before-destroying-qp.patch
 +ib_srpt-always-set-response-for-task-management.patch
 +rtlwifi-align-private-space-in-rtl_priv-struct.patch
 +p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch
 +can-flexcan-fix-flexcan_chip_start-on-imx6.patch
+ dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch
+ dmaengine-imx-dma-fix-callback-path-in-tasklet.patch
+ dmaengine-imx-dma-fix-slow-path-issue-in-prep_dma_cyclic.patch
+ staging-comedi-ni_65xx-bug-fix-confine-insn_bits-to-one-subdevice.patch
+ mm-show_mem-suppress-page-counts-in-non-blockable-contexts.patch
+ acpi-ipmi-fix-atomic-context-requirement-of-ipmi_msg_handler.patch
+ tile-use-a-more-conservative-__my_cpu_offset-in-config_preempt.patch
+ btrfs-change-how-we-queue-blocks-for-backref-checking.patch
+ ext4-avoid-hang-when-mounting-non-journal-filesystems-with-orphan-list.patch