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

Conflicts:
	queue-3.0/series
	queue-3.4/series
	queue-3.6/series

diff --cc queue-3.0/series
index fdd325913b2f5a5a6a689cded681429bf1eb938a,78580a87225cde61f57163c59deb1d42dd48a5bb..c0bb6a3b9a5e928b211bc4aff6f74e46c14dbd96
--- 1/queue-3.0/series
--- 2/queue-3.0/series
+++ b/queue-3.0/series
@@@ -9,9 -9,18 +9,24 @@@ asoc-wm8978-pll-incorrectly-configured-
  asoc-dapm-use-card_list-during-dapm-shutdown.patch
  ubifs-fix-mounting-problems-after-power-cuts.patch
  ubifs-introduce-categorized-lprops-counter.patch
 +s390-gup-add-missing-task_size-check-to-get_user_pages_fast.patch
 +usb-option-add-novatel-e362-and-dell-wireless-5800-usb-ids.patch
 +usb-option-add-alcatel-x220-x500d-usb-ids.patch
 +memcg-oom-fix-totalpages-calculation-for-memory.swappiness-0.patch
 +wireless-allow-40-mhz-on-world-roaming-channels-12-13.patch
 +m68k-fix-sigset_t-accessor-functions.patch
+ ipv4-avoid-undefined-behavior-in-do_ip_setsockopt.patch
+ ipv6-setsockopt-ipipproto_ipv6-ipv6_minhopcount-forgot-to-set-return-value.patch
+ net-correct-check-in-dev_addr_del.patch
+ net-rps-fix-brokeness-causing-ooo-packets.patch
+ r8169-use-unlimited-dma-burst-for-tx.patch
+ kbuild-fix-gcc-x-syntax.patch
+ netfilter-validate-the-sequence-number-of-dataless-ack-packets-as-well.patch
+ netfilter-mark-syn-ack-packets-as-invalid-from-original-direction.patch
+ netfilter-nf_nat-don-t-check-for-port-change-on-icmp-tuples.patch
+ usb-use-usb_serial_put-in-usb_serial_probe-errors.patch
+ ecryptfs-copy-up-posix-acl-and-read-only-flags-from-lower-mount.patch
+ ecryptfs-check-for-ecryptfs-cipher-support-at-mount.patch
+ sky2-fix-for-interrupt-handler.patch
+ drm-i915-fix-overlay-on-i830m.patch
+ nfs-wait-for-session-recovery-to-finish-before-returning.patch

diff --cc queue-3.4/series
index 6b318e117967b95ef6734de573c0d06d2fb29f9e,b5b2ebe89766b7a4428f7b331f3823c989a88882..bd53597b19b6c8701beb82ab3d04308b99fec60d
--- 1/queue-3.4/series
--- 2/queue-3.4/series
+++ b/queue-3.4/series
@@@ -20,12 -20,22 +20,31 @@@ asoc-wm8978-pll-incorrectly-configured-
  asoc-dapm-use-card_list-during-dapm-shutdown.patch
  ubifs-fix-mounting-problems-after-power-cuts.patch
  ubifs-introduce-categorized-lprops-counter.patch
 +revert-staging-android-alarm-ioctl-command-encoding-fix.patch
 +s390-gup-add-missing-task_size-check-to-get_user_pages_fast.patch
 +usb-option-add-novatel-e362-and-dell-wireless-5800-usb-ids.patch
 +usb-option-add-alcatel-x220-x500d-usb-ids.patch
 +drm-radeon-fix-logic-error-in-atombios_encoders.c.patch
 +ttm-clear-the-ttm-page-allocated-from-high-memory-zone-correctly.patch
 +memcg-oom-fix-totalpages-calculation-for-memory.swappiness-0.patch
 +wireless-allow-40-mhz-on-world-roaming-channels-12-13.patch
 +m68k-fix-sigset_t-accessor-functions.patch
+ ipv4-avoid-undefined-behavior-in-do_ip_setsockopt.patch
+ ipv6-setsockopt-ipipproto_ipv6-ipv6_minhopcount-forgot-to-set-return-value.patch
+ net-correct-check-in-dev_addr_del.patch
+ net-rps-fix-brokeness-causing-ooo-packets.patch
+ tmpfs-change-final-i_blocks-bug-to-warning.patch
+ r8169-use-unlimited-dma-burst-for-tx.patch
+ xen-events-fix-rcu-warning-or-call-idle-notifier-after-irq_enter.patch
+ r8169-fix-wol-on-rtl8168d-8111d.patch
+ r8169-allow-multicast-packets-on-sub-8168f-chipset.patch
+ netfilter-validate-the-sequence-number-of-dataless-ack-packets-as-well.patch
+ netfilter-mark-syn-ack-packets-as-invalid-from-original-direction.patch
+ netfilter-nf_nat-don-t-check-for-port-change-on-icmp-tuples.patch
+ usb-use-usb_serial_put-in-usb_serial_probe-errors.patch
+ ecryptfs-copy-up-posix-acl-and-read-only-flags-from-lower-mount.patch
+ ecryptfs-check-for-ecryptfs-cipher-support-at-mount.patch
+ sky2-fix-for-interrupt-handler.patch
+ s390-signal-set-correct-address-space-control.patch
+ drm-i915-fix-overlay-on-i830m.patch
+ nfs-wait-for-session-recovery-to-finish-before-returning.patch

diff --cc queue-3.6/series
index f66bbe953c4a4e02b3693b58b55d3570c325e0c7,d3bd7feb83f3adc01ba284b4676f8ff39c7edc15..47d7fc466bbda9e3266045d7249b00c8b13476c1
--- 1/queue-3.6/series
--- 2/queue-3.6/series
+++ b/queue-3.6/series
@@@ -29,25 -29,24 +29,46 @@@ asoc-dapm-use-card_list-during-dapm-shu
  asoc-core-double-control-update-err-for-snd_soc_put_volsw_sx.patch
  ubifs-fix-mounting-problems-after-power-cuts.patch
  ubifs-introduce-categorized-lprops-counter.patch
 +pstore-fix-null-pointer-dereference-in-console-writes.patch
 +regulator-fix-voltage-check-in-regulator_is_supported_voltage.patch
 +i2c-mux-pinctrl-fix-probe-error-path.patch
 +arm-imx-ehci-fix-host-power-mask-bit.patch
 +arm-dt-tegra-fix-length-of-pad-control-and-mux-registers.patch
 +revert-staging-android-alarm-ioctl-command-encoding-fix.patch
 +s390-gup-add-missing-task_size-check-to-get_user_pages_fast.patch
 +usb-keyspan-fix-typo-causing-gpf-on-open.patch
 +usb-usb_wwan-fix-bulk-urb-allocation.patch
 +usb-option-add-novatel-e362-and-dell-wireless-5800-usb-ids.patch
 +usb-option-add-alcatel-x220-x500d-usb-ids.patch
 +drm-i915-sdvo-clean-up-connectors-on-intel_sdvo_init-failures.patch
 +drm-radeon-fix-logic-error-in-atombios_encoders.c.patch
 +tmpfs-fix-shmem_getpage_gfp-vm_bug_on.patch
 +kvm-x86-fix-invalid-secondary-exec-controls-in-vmx_cpuid_update.patch
 +ttm-clear-the-ttm-page-allocated-from-high-memory-zone-correctly.patch
 +memcg-oom-fix-totalpages-calculation-for-memory.swappiness-0.patch
 +memcg-fix-hotplugged-memory-zone-oops.patch
 +iwlwifi-handle-dma-mapping-failures.patch
 +wireless-allow-40-mhz-on-world-roaming-channels-12-13.patch
 +bluetooth-fix-having-bogus-entries-in-mgmt_read_index_list-reply.patch
 +m68k-fix-sigset_t-accessor-functions.patch
+ ipv4-avoid-undefined-behavior-in-do_ip_setsockopt.patch
+ ipv4-ip_vti.c-vti-fix-post-decryption-forwarding.patch
+ ipv6-setsockopt-ipipproto_ipv6-ipv6_minhopcount-forgot-to-set-return-value.patch
+ net-correct-check-in-dev_addr_del.patch
+ net-rps-fix-brokeness-causing-ooo-packets.patch
+ sctp-fix-proc-net-sctp-memory-leak.patch
+ tcp-fix-retransmission-in-repair-mode.patch
+ tcp-handle-tcp_net_metrics_init-order-5-memory-allocation-failures.patch
+ tmpfs-change-final-i_blocks-bug-to-warning.patch
+ alsa-usb-audio-fix-crash-at-re-preparing-the-pcm-stream.patch
+ gfs2-don-t-call-file_accessed-with-a-shared-glock.patch
+ r8169-use-unlimited-dma-burst-for-tx.patch
+ xen-events-fix-rcu-warning-or-call-idle-notifier-after-irq_enter.patch
+ scsi-isci-allow-ssp-tasks-into-the-task-management-path.patch
+ tg3-unconditionally-select-hwmon-support-when-tg3-is-enabled.patch
+ r8169-fix-wol-on-rtl8168d-8111d.patch
+ r8169-allow-multicast-packets-on-sub-8168f-chipset.patch
+ netfilter-nf_nat-don-t-check-for-port-change-on-icmp-tuples.patch
+ netfilter-xt_tee-don-t-use-destination-address-found-in-header.patch
+ netfilter-nf_conntrack-fix-rt_gateway-checks-for-h.323-helper.patch
+ s390-signal-set-correct-address-space-control.patch