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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  math-emu: correct test for downshifting fraction in _FP_FROM_INT()
  perf: Add DWARF register lookup for sparc
  MAINTAINERS: Add SBUS driver path to sparc entry.
  drivers/sbus: Remove unnecessary casts of private_data
  sparc: remove homegrown L1_CACHE_ALIGN macro
  sparc64: fix the build error due to smp_kgdb_capture_client()
  sparc64: Fix maybe_change_configuration() PCR setting.
  arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference
  sparc64: Update defconfig.
  sunsu: Fix use after free in su_remove().
  sunserial: Don't call add_preferred_console() when console= is specified.
  sparc32: Kill none_mask, it's bogus.

diff --combined MAINTAINERS
index 58848125b8bfadcc70f9b37ac68d77d6aee0794b,1b277665e634adb9db5c8781d4682a62c522cb8f..db3d0f5061f9c42e301e420878b0dc5cbe31e6e1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -896,13 -896,11 +896,13 @@@ S:      Maintaine
  
  ARM/SAMSUNG ARM ARCHITECTURES
  M:    Ben Dooks <ben-linux@fluff.org>
 +M:    Kukjin Kim <kgene.kim@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
 -F:    arch/arm/plat-s3c/
 +F:    arch/arm/plat-samsung/
  F:    arch/arm/plat-s3c24xx/
 +F:    arch/arm/plat-s5p/
  
  ARM/S3C2410 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
@@@ -1150,7 -1148,7 +1150,7 @@@ F:      drivers/mmc/host/atmel-mci.
  F:    drivers/mmc/host/atmel-mci-regs.h
  
  ATMEL AT91 / AT32 SERIAL DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  S:    Supported
  F:    drivers/serial/atmel_serial.c
  
@@@ -1162,18 -1160,18 +1162,18 @@@ F:   drivers/video/atmel_lcdfb.
  F:    include/video/atmel_lcdc.h
  
  ATMEL MACB ETHERNET DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  S:    Supported
  F:    drivers/net/macb.*
  
  ATMEL SPI DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  S:    Supported
  F:    drivers/spi/atmel_spi.*
  
  ATMEL USBA UDC DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 -L:    kernel@avr32linux.org
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
  S:    Supported
  F:    drivers/usb/gadget/atmel_usba_udc.*
@@@ -1583,7 -1581,7 +1583,7 @@@ F:      include/linux/coda*.
  
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <sfrench@samba.org>
 -L:    linux-cifs-client@lists.samba.org (moderated for non-subscribers)
 +L:    linux-cifs@vger.kernel.org
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
  Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
@@@ -2111,20 -2109,11 +2111,20 @@@ F:   drivers/edac/i5000_edac.
  
  EDAC-I5400
  M:    Mauro Carvalho Chehab <mchehab@redhat.com>
 -L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
 +EDAC-I7CORE
 +M:    Mauro Carvalho Chehab <mchehab@redhat.com>
 +L:    linux-edac@vger.kernel.org
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +F:    drivers/edac/i7core_edac.c
 +F:    drivers/edac/edac_mce.c
 +F:    include/linux/edac_mce.h
 +
  EDAC-I82975X
  M:    Ranganathan Desikan <ravi@jetztechnologies.com>
  M:    "Arvind R." <arvind@jetztechnologies.com>
@@@ -2898,13 -2887,6 +2898,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/input/
  
 +INPUT MULTITOUCH (MT) PROTOCOL
 +M:    Henrik Rydberg <rydberg@euromail.se>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/input/multi-touch-protocol.txt
 +K:    \b(ABS|SYN)_MT_
 +
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@lists.linux-foundation.org
@@@ -2996,14 -2978,20 +2996,14 @@@ F:   drivers/net/ixgb
  F:    drivers/net/ixgbe/
  
  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 -M:    Reinette Chatre <reinette.chatre@intel.com>
 -M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://ipw2100.sourceforge.net
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/networking/README.ipw2100
  F:    drivers/net/wireless/ipw2x00/ipw2100.*
  
  INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
 -M:    Reinette Chatre <reinette.chatre@intel.com>
 -M:    Intel Linux Wireless <ilw@linux.intel.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://ipw2200.sourceforge.net
 -S:    Odd Fixes
 +S:    Orphan
  F:    Documentation/networking/README.ipw2200
  F:    drivers/net/wireless/ipw2x00/ipw2200.*
  
@@@ -3391,7 -3379,7 +3391,7 @@@ KPROBE
  M:    Ananth N Mavinakayanahalli <ananth@in.ibm.com>
  M:    Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  M:    "David S. Miller" <davem@davemloft.net>
 -M:    Masami Hiramatsu <mhiramat@redhat.com>
 +M:    Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
  S:    Maintained
  F:    Documentation/kprobes.txt
  F:    include/linux/kprobes.h
@@@ -4224,7 -4212,6 +4224,7 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    devicetree-discuss@lists.ozlabs.org
  W:    http://fdt.secretlab.ca
 +T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  F:    drivers/of
  F:    include/linux/of*.h
@@@ -4639,12 -4626,6 +4639,12 @@@ M:    Robert Jarzmik <robert.jarzmik@free.
  L:    rtc-linux@googlegroups.com
  S:    Maintained
  
 +QLOGIC QLA1280 SCSI DRIVER
 +M:    Michael Reed <mdr@sgi.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Maintained
 +F:    drivers/scsi/qla1280.[ch]
 +
  QLOGIC QLA2XXX FC-SCSI DRIVER
  M:    Andrew Vasquez <andrew.vasquez@qlogic.com>
  M:    linux-driver@qlogic.com
@@@ -5336,6 -5317,7 +5336,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
  S:    Maintained
  F:    arch/sparc/
+ F:    drivers/sbus
  
  SPARC SERIAL DRIVERS
  M:    "David S. Miller" <davem@davemloft.net>
@@@ -5403,7 -5385,6 +5404,7 @@@ M:      David Brownell <dbrownell@users.sour
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
 +T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  F:    Documentation/spi/
  F:    drivers/spi/