From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 15 Sep 2010 19:27:14 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v2.6.27.54~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a41db63b620a94d2db99c18c1c4f27cb990c7cc3;p=thirdparty%2Fkernel%2Fstable-queue.git

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

Conflicts:
	queue-2.6.32/series
	queue-2.6.35/series
---

a41db63b620a94d2db99c18c1c4f27cb990c7cc3
diff --cc queue-2.6.32/series
index 92dd861d284,85f047d8614..8398a756ec1
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@@ -6,20 -6,5 +6,22 @@@ sata_mv-fix-broken-dsm-trim-support-v2.
  x86-tsc-sched-recompute-cyc2ns_offset-s-during-resume-from-sleep-states.patch
  pci-msi-remove-unsafe-and-unnecessary-hardware-access.patch
  pci-msi-restore-read_msi_msg_desc-add-get_cached_msi_msg_desc.patch
+ sched-kill-migration-thread-in-cpu_post_dead-instead-of-cpu_dead.patch
+ sched-revert-stable-c6fc81a-sched-fix-a-race-between-ttwu-and-migrate_task.patch
 +staging-hv-fix-missing-functions-for-net_device_ops.patch
 +staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch
 +staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch
 +staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch
 +staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch
 +fuse-flush-background-queue-on-connection-close.patch
 +ath9k_hw-fix-parsing-of-ht40-5-ghz-ctls.patch
 +ocfs2-fix-incorrect-checksum-validation-error.patch
 +usb-ehci-ppc-of-problems-in-unwind.patch
 +usb-fix-kernel-oops-with-g_ether-and-windows.patch
 +usb-cp210x-add-new-device-id.patch
 +usb-cp210x-add-b-g-h3000-link-cable-id.patch
 +usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch
 +usb-serial-extra-device-vendor-id-for-mos7840-driver.patch
 +usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch
 +usb-mos7840-fix-dma-buffers-on-stack-and-endianess-bugs.patch
 +usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch
diff --cc queue-2.6.35/series
index a6fe4c55d1f,926c5121bc1..b3fbbbb1912
--- a/queue-2.6.35/series
+++ b/queue-2.6.35/series
@@@ -19,24 -19,6 +19,27 @@@ pci-msi-restore-read_msi_msg_desc-add-g
  direct-io-move-aio_complete-into-end_io.patch
  ext4-move-aio-completion-after-unwritten-extent-conversion.patch
  xfs-move-aio-completion-after-unwritten-extent-conversion.patch
+ revert-input-appletouch-fix-integer-overflow-issue.patch
+ alsa-hda-handle-missing-nid-0x1b-on-alc259-codec.patch
+ alsa-hda-handle-pin-nid-0x1a-on-alc259-269.patch
 +staging-rt2870sta-add-more-device-ids-from-vendor-drivers.patch
 +staging-hv-fix-missing-functions-for-net_device_ops.patch
 +staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch
 +staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch
 +staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch
 +staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch
 +fuse-flush-background-queue-on-connection-close.patch
 +mac80211-delete-work-timer.patch
 +ath9k_htc-fix-disconnect-issue-in-ht40-mode.patch
 +ath9k_hw-fix-eeprom-uncompress-block-reading-on-ar9003.patch
 +ath9k_hw-fix-parsing-of-ht40-5-ghz-ctls.patch
 +ocfs2-fix-incorrect-checksum-validation-error.patch
 +serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch
 +usb-ehci-ppc-of-problems-in-unwind.patch
 +usb-fix-kernel-oops-with-g_ether-and-windows.patch
 +usb-cp210x-add-new-device-id.patch
 +usb-cp210x-add-b-g-h3000-link-cable-id.patch
 +usb-allow-drivers-to-use-allocated-bandwidth-until-unbound.patch
 +usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch
 +usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4-2p.patch
 +usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch