[kernel/f12/user/myoung/xendom0: 15/16] Merge branch 'f12/master' into f12/user/myoung/xendom0

[myoung]

commit 11574d71a51fbd19255e2d5798dbf52284a1a29c
Merge: c037070 b9204c2
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Fri Sep 3 22:04:30 2010 +0100

    Merge branch 'f12/master' into f12/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec

 cifs-fix-dns-resolver.patch                        |   47 -
 config-generic                                     |    4 +-
 crypto-testmgr-add-null-test-for-aesni.patch       |  138 ---
 drm-i915-add-reclaimable-to-page-allocations.patch |   48 -
 drm-i915-fix-hibernate-memory-corruption.patch     |   41 -
 drm-nouveau-nva3-noaccel.patch                     |  105 ++
 drm-upgrayed-fixes.patch                           | 1092 ++++++++++++++++++++
 drm-upgrayedd.patch                                |   10 +-
 ...t-ioctl-can-t-overwrite-append-only-files.patch |   34 -
 ...lean-up-self-ias_obj-on-irda_bind-failure.patch |   35 +
 kernel.spec                                        |  103 ++-
 linux-2.6-btrfs-fix-acl.patch                      |   25 -
 linux-2.6-execshield.patch                         |   11 +-
 linux-2.6-upstream-reverts.patch                   |   39 +
 linux-2.6-usb-wwan-update.patch                    |    9 +-
 sources                                            |    3 +-
 ssb_check_for_sprom.patch                          |  185 ----
 ...wapext-from-operating-on-write-only-files.patch |   42 -
 18 files changed, 1365 insertions(+), 606 deletions(-)
---
diff --cc kernel.spec
index 3816cbb,6f31900..6f54300
--- a/kernel.spec
+++ b/kernel.spec
@@@ -849,10 -838,8 +840,12 @@@ Patch14130: kvm-mmu-fix-conflict-access
  Patch14140: hid-01-usbhid-initialize-interface-pointers-early-enough.patch
  Patch14141: hid-02-fix-suspend-crash-by-moving-initializations-earlier.patch
  
+ Patch14150: irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
+ 
 +Patch19997: xen.pvops.pre.patch
 +Patch19998: xen.pvops.patch
 +Patch19999: xen.pvops.post.patch
 +
  # ==============================================================================
  %endif
  
@@@ -1575,10 -1547,9 +1553,13 @@@ ApplyPatch kvm-mmu-fix-conflict-access-
  ApplyPatch hid-01-usbhid-initialize-interface-pointers-early-enough.patch
  ApplyPatch hid-02-fix-suspend-crash-by-moving-initializations-earlier.patch
  
+ # CVE-2010-2954
+ ApplyPatch irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
+ 
 +ApplyPatch xen.pvops.pre.patch
 +ApplyPatch xen.pvops.patch
 +ApplyPatch xen.pvops.post.patch
 +
  # END OF PATCH APPLICATIONS ====================================================
  %endif