Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix deadlock, make pgd_lock irq-safe
  virtio: fix trivial build bug
  x86: fix mttr trimming
  x86: delay CPA self-test and repeat it
  x86: fix 64-bit sections
  generic: add __FINITDATA
  x86: remove suprious ifdefs from pageattr.c
  x86: mark the .rodata section also NX
  x86: fix iret exception recovery on 64-bit
  cpuidle: dubious one-bit signed bitfield in cpuidle.h
  x86: fix sparse warnings in powernow-k8.c
  x86: fix sparse error in traps_32.c
  x86: trivial sparse/checkpatch in quirks.c
  x86 ptrace: disallow null cs/ss
  MAINTAINERS: RDC R-321x SoC maintainer
  brk randomization: introduce CONFIG_COMPAT_BRK
  brk: check the lower bound properly
  x86: remove X2 workaround
  x86: make spurious fault handler aware of large mappings
  x86: make traps on entry code be debuggable in user space, 64-bit

diff --combined MAINTAINERS
index c5325d2bb86d03748b4d944d3b85252e6a3724a1,cffe13d71baaef07eaaf7ed3e8a5c483a5545426..0885aa2b095a44b3cd66567f80f50aab75ce6d95
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -338,12 -338,13 +338,12 @@@ S:      Maintained for 2.4; PCI support for 
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  P:    Thomas Dahlmann
  M:    thomas.dahlmann@amd.com
 -L:    info-linux@geode.amd.com
 +L:    info-linux@geode.amd.com        (subscribers-only)
  S:    Supported
  
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
  P:    Jordan Crouse
 -M:    info-linux@geode.amd.com
 -L:    info-linux@geode.amd.com
 +L:    info-linux@geode.amd.com        (subscribers-only)
  W:    http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
  S:    Supported
  
@@@ -840,12 -841,6 +840,12 @@@ L:       linux-kernel@vger.kernel.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
  S:    Maintained
  
 +BLOCK2MTD DRIVER
 +P:    Joern Engel
 +M:    joern@lazybastard.org
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +
  BLUETOOTH SUBSYSTEM
  P:    Marcel Holtmann
  M:    marcel@holtmann.org
@@@ -3036,8 -3031,8 +3036,8 @@@ L:      linux-abi-devel@lists.sourceforge.ne
  S:    Maintained
  
  PHRAM MTD DRIVER
 -P:    Jörn Engel
 -M:    joern@wh.fh-wedel.de
 +P:    Joern Engel
 +M:    joern@lazybastard.org
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
  
@@@ -3224,6 -3219,12 +3224,12 @@@ M:    mporter@kernel.crashing.or
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
+ RDC R-321X SoC
+ P:    Florian Fainelli
+ M:    florian.fainelli@telecomint.eu
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ 
  RDC R6040 FAST ETHERNET DRIVER
  P:    Florian Fainelli
  M:    florian.fainelli@telecomint.eu
@@@ -3861,12 -3862,6 +3867,12 @@@ M:    oliver@neukum.nam
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  
 +USB AUERSWALD DRIVER
 +P:    Wolfgang Muees
 +M:    wolfgang@iksw-muees.de
 +L:      linux-usb@vger.kernel.org
 +S:    Maintained
 +
  USB BLOCK DRIVER (UB ub)
  P:    Pete Zaitcev
  M:    zaitcev@redhat.com
@@@ -4017,6 -4012,12 +4023,6 @@@ S:     Maintaine
  W:    http://geocities.com/i0xox0i
  W:    http://firstlight.net/cvs
  
 -USB AUERSWALD DRIVER
 -P:    Wolfgang Muees
 -M:    wolfgang@iksw-muees.de
 -L:      linux-usb@vger.kernel.org
 -S:    Maintained
 -
  USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER
  P:    Gary Brubaker
  M:    xavyer@ix.netcom.com