]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Jun 2013 04:44:21 +0000 (21:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Jun 2013 04:44:21 +0000 (21:44 -0700)
Conflicts:
queue-3.9/series

1  2 
queue-3.4/series
queue-3.9/series

Simple merge
index 47fcd035292bfa34a457e775aeb1c3eddd2374ba,2858efd9a33798b2e8e136172c7b0ad6d10db9d0..5c8af022ea21441868fa70facbe8d004025a1aed
@@@ -71,11 -71,12 +71,20 @@@ drm-radeon-fix-typo-in-cu_per_sh-on-ver
  drm-radeon-fix-card_posted-check-for-newer-asics.patch
  crypto-caam-fix-inconsistent-assoc-dma-mapping-direction.patch
  cifs-fix-potential-buffer-overrun-when-composing-a-new-options-string.patch
 +sata_rcar-clear-stop-bit-in-bmdma_start-method.patch
 +sata_rcar-fix-interrupt-handling.patch
 +ata_piix-add-pci-ids-for-intel-baytail.patch
 +libata-make-ata_exec_internal_sg-honor-dmadir.patch
 +m68k-mac-fix-unexpected-interrupt-with-config_early_printk.patch
 +s390-pgtable-fix-check-for-pgste-storage-key-handling.patch
 +cgroup-initialize-xattr-before-calling-d_instantiate.patch
 +cgroup-fix-a-subtle-bug-in-descendant-pre-order-walk.patch
+ powerpc-32bit-store-temporary-result-in-r0-instead-of-r8.patch
+ powerpc-tm-make-room-for-hypervisor-in-abort-cause-codes.patch
+ powerpc-tm-update-cause-codes-documentation.patch
+ powerpc-tm-fix-userspace-stack-corruption-on-signal-delivery-for-active-transactions.patch
+ powerpc-tm-abort-on-emulation-and-alignment-faults.patch
+ powerpc-tm-move-tm-abort-cause-codes-to-uapi.patch
+ iscsi-target-fix-heap-buffer-overflow-on-error.patch
+ ib_srpt-call-target_sess_cmd_list_set_waiting-during-shutdown_session.patch
+ nfsv4-fix-a-thinko-in-nfs4_try_open_cached.patch