[kernel/f13/user/steved/pnfs-13: 49/49] Merge branch 'f13/user/steved/pnfs-13' of ssh://pkgs.fedoraproject.org/kernel into f13/user/steved/p

[Steve Dickson]

commit 45c85eded3e4c299ac386421c52629f0b5c305ae
Merge: cf0a5bb c368aef
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Sep 29 17:55:47 2010 -0400

    Merge branch 'f13/user/steved/pnfs-13' of ssh://pkgs.fedoraproject.org/kernel into f13/user/steved/pnfs-13
    
    Conflicts:
    	kernel.spec

 kernel.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index 6b9632c,0949220..2eabb4d
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2175,87 -2056,6 +2175,88 @@@ f
  
  
  %changelog
 +* Mon Sep 27 2010 Ben Skeggs <bskeggs at redhat.com> 2.6.34.7-58
 +- nouveau: better handling of certain GPU errors
 +
 +* Fri Sep 24 2010 Chuck Ebbert <cebbert at redhat.com>
 +- Fix typo in previous Xen fix that causes boot failure.
 +
 +* Wed Sep 22 2010 Chuck Ebbert <cebbert at redhat.com>
 +- Copy two Xen fixes from 2.6.35-stable for RHBZ#636534
 +
 +* Tue Sep 21 2010 Chuck Ebbert <cebbert at redhat.com>
 +- Fix RHBZ #633037, Process user time incorrectly accounted as system time
 +
 +* Mon Sep 20 2010 Chuck Ebbert <cebbert at redhat.com>
 +- Fix AGP aperture size detection on Intel G33/Q35 chipsets (#629203)
 +
 +* Tue Sep 14 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.34.7-56
 +- Fix CVE-2010-3079: ftrace NULL pointer dereference
 +
 +* Tue Sep 14 2010 Chuck Ebbert <cebbert at redhat.com>
 +- Fix CVE-2010-3080: /dev/sequencer open failure is not handled correctly
 +
 +* Tue Sep 14 2010 Chuck Ebbert <cebbert at redhat.com>
 +- Fix bug added in 2.6.34.6-53
 +
 +* Tue Sep 14 2010 Chuck Ebbert <cebbert at redhat.com>
 +- Mitigate DOS with large argument lists.
 +
 +* Tue Sep 14 2010 Kyle McMartin <kyle at redhat.com>
 +- x86_64: plug compat syscalls holes. (CVE-2010-3081, CVE-2010-3301)
 +  upgrading is highly recommended.
 +- aio: check for multiplication overflow in do_io_submit. (CVE-2010-3067)
 +
 +* Tue Sep 14 2010 Chuck Ebbert <cebbert at redhat.com>
 +- Linux 2.6.34.7, should fix multiple USB HID device issues.
 +
 +* Mon Sep 13 2010 Ben Skeggs <bskeggs at redhat.com> 2.6.34.6-55
 +- nouveau: fix oops in acpi edid support (rhbz#613284)
 +
 +* Thu Sep 09 2010 Kyle McMartin <kyle at redhat.com>
 +- Backport 6f772d7e to hopefully fix #629442,
 +  (drm/i915: Explosion following OOM in do_execbuffer.)
 +
 +* Wed Sep 08 2010 Kyle McMartin <kyle at redhat.com>
 +- Enable GPIO_SYSFS. (#631958)
 +
 +* Sun Sep 05 2010 Jarod Wilson <jarod at redhat.com> 2.6.34.6-54
 +- Restore lirc patch from 2.6.33.x F13 kernels, re-fixes multiple issues
 +
 +* Sat Sep 04 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.34.6-53
 +- Disable asynchronous suspend, a new feature in 2.6.34
 +- Fix unsafe access to MSI registers during suspend
 +  (pci-msi-remove-unsafe-and-unnecessary-hardware-access.patch,
 +   pci-msi-restore-read_msi_msg_desc-add-get_cached_msi_msg_desc.patch)
 +- x86-tsc-sched-recompute-cyc2ns_offset-s-during-resume-from-sleep-states.patch
 +   Fix load balancing after suspend/resume cycle (taken from 2.6.32 stable queue)
 +
 +* Fri Sep 03 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.34.6-52
 +- acpi-ec-pm-fix-race-between-ec-transactions-and-system-suspend.patch:
 +  another possible fix for suspend/resume problems.
 +- From 2.6.35.4: nfs-fix-an-oops-in-the-nfsv4-atomic-open-code.patch
 +- Add fix for CVE-2010-2960: keyctl_session_to_parent NULL deref system crash
 +
 +* Fri Sep 03 2010 Kyle McMartin <kmcmartin at redhat.com>
 +- default to pci=nocrs
 +- flexcop: fix registering braindead stupid names (#575873)
 +
 +* Fri Sep 03 2010 Kyle McMartin <kmcmartin at redhat.com> 2.6.34.6-51
 +- lirc_imon: move alloc before use (rhbz#629980)
 +
 +* Fri Sep 03 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.6-50
 +- Re-enable I2O, but only for 32-bit x86 (#629676)
 +- Add support for eject key on Dell laptops (#513530)
 +- irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch (CVE-2010-2954)
 +- wireless-extensions-fix-kernel-heap-content-leak.patch (CVE-2010-2955)
 +
 +* Thu Sep 02 2010 Dave Airlie <airlied at redhat.com> 2.6.34.6-49
 +- fix radeon suspend/resume issues and two other minor patches
 +
 +* Wed Sep 01 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.6-48
 +- Revert commit 6a1a82df91fa0eb1cc76069a9efe5714d087eccd from 2.6.34.1;
 +  it breaks ftdi_sio (#613597)
++
  * Tue Aug 31 2010 Steve Dickson <steved at redhat.com>
  - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24