Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (224 commits)
  ARM: remove 'select GENERIC_TIME'
  ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO
  ARM: 6074/1: oprofile: convert from sysdev to platform device
  ARM: 6073/1: oprofile: remove old files and update KConfig
  ARM: 6072/1: oprofile: use perf-events framework as backend
  ARM: 6071/1: perf-events: allow modules to query the number of hardware counters
  ARM: 6070/1: perf-events: add support for xscale PMUs
  ARM: 6069/1: perf-events: use numeric ID to identify PMU
  ARM: 6064/1: pmu: register IRQs at runtime
  ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA
  ARM: 6134/1: Handle instruction cache maintenance fault properly
  ARM: nwfpe: allow debugging output to be configured at runtime
  ARM: rename mach_cpu_disable() to platform_cpu_disable()
  ARM: 6132/1: PL330: Add common core driver
  ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310
  ARM: Move memory mapping into mmu.c
  ARM: Ensure meminfo is sorted prior to sanity_check_meminfo
  ARM: Remove useless linux/bootmem.h includes
  ARM: convert /proc/cpu/aligment to seq_file
  arm: use asm-generic/scatterlist.h
  ...

diff --combined MAINTAINERS
index 3d2651b,c84f003..a77ae73
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -586,6 -586,12 +586,12 @@@ F:       drivers/mtd/nand/bcm_umi_bch.
  F:    drivers/mtd/nand/bcm_umi_hamming.c
  F:    drivers/mtd/nand/nand_bcm_umi.h
  
+ ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
+ M:    Anton Vorontsov <avorontsov@mvista.com>
+ S:    Maintained
+ F:    arch/arm/mach-cns3xxx/
+ T:    git git://git.infradead.org/users/cbou/linux-cns3xxx.git
+ 
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
  M:    Ryan Mallon <ryan@bluewatersys.com>
@@@ -775,11 -781,10 +781,10 @@@ M:      Philipp Zabel <philipp.zabel@gmail.c
  S:    Maintained
  
  ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
- M:    Lennert Buytenhek <buytenh@marvell.com>
- M:    Nicolas Pitre <nico@marvell.com>
+ M:    Lennert Buytenhek <kernel@wantstofly.org>
+ M:    Nicolas Pitre <nico@fluxnic.net>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- T:    git git://git.marvell.com/orion
- S:    Maintained
+ S:    Odd Fixes
  F:    arch/arm/mach-loki/
  F:    arch/arm/mach-kirkwood/
  F:    arch/arm/mach-mv78xx0/
@@@ -994,6 -999,20 +999,20 @@@ W:       http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/vfp/
  
+ ARM/VOIPAC PXA270 SUPPORT
+ M:    Marek Vasut <marek.vasut@gmail.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-pxa/vpac270.c
+ F:    arch/arm/mach-pxa/include/mach-pxa/vpac270.h
+ 
+ ARM/ZIPIT Z2 SUPPORT
+ M:    Marek Vasut <marek.vasut@gmail.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-pxa/z2.c
+ F:    arch/arm/mach-pxa/include/mach-pxa/z2.h
+ 
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <george.joseph@fairview5.com>
  L:    lm-sensors@lm-sensors.org
@@@ -2953,17 -2972,6 +2972,17 @@@ S:    Odd Fixe
  F:    Documentation/networking/README.ipw2200
  F:    drivers/net/wireless/ipw2x00/ipw2200.*
  
 +INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 +M:    Joseph Cihula <joseph.cihula@intel.com>
 +M:    Shane Wang <shane.wang@intel.com>
 +L:    tboot-devel@lists.sourceforge.net
 +W:    http://tboot.sourceforge.net
 +T:    Mercurial http://www.bughost.org/repos.hg/tboot.hg
 +S:    Supported
 +F:    Documentation/intel_txt.txt
 +F:    include/linux/tboot.h
 +F:    arch/x86/kernel/tboot.c
 +
  INTEL WIRELESS WIMAX CONNECTION 2400
  M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
  M:    linux-wimax@intel.com
@@@ -3635,7 -3643,8 +3654,8 @@@ F:      drivers/net/wireless/mwl8k.
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  M:    Nicolas Pitre <nico@fluxnic.net>
- S:    Maintained
+ S:    Odd Fixes
+ F: drivers/mmc/host/mvsdio.*
  
  MARVELL YUKON / SYSKONNECT DRIVER
  M:    Mirko Lindner <mlindner@syskonnect.de>
@@@ -4176,7 -4185,6 +4196,7 @@@ OPROFIL
  M:    Robert Richter <robert.richter@amd.com>
  L:    oprofile-list@lists.sf.net
  S:    Maintained
 +F:    arch/*/include/asm/oprofile*.h
  F:    arch/*/oprofile/
  F:    drivers/oprofile/
  F:    include/linux/oprofile.h
@@@ -4365,13 -4373,13 +4385,13 @@@ M:   Paul Mackerras <paulus@samba.org
  M:    Ingo Molnar <mingo@elte.hu>
  M:    Arnaldo Carvalho de Melo <acme@redhat.com>
  S:    Supported
 -F:    kernel/perf_event.c
 +F:    kernel/perf_event*.c
  F:    include/linux/perf_event.h
 -F:    arch/*/kernel/perf_event.c
 -F:    arch/*/kernel/*/perf_event.c
 -F:    arch/*/kernel/*/*/perf_event.c
 +F:    arch/*/kernel/perf_event*.c
 +F:    arch/*/kernel/*/perf_event*.c
 +F:    arch/*/kernel/*/*/perf_event*.c
  F:    arch/*/include/asm/perf_event.h
 -F:    arch/*/lib/perf_event.c
 +F:    arch/*/lib/perf_event*.c
  F:    arch/*/kernel/perf_callchain.c
  F:    tools/perf/
  
@@@ -5133,7 -5141,7 +5153,7 @@@ F:      mm/sl?b.
  
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <nico@fluxnic.net>
- S:    Maintained
+ S:    Odd Fixes
  F:    drivers/net/smc91x.*
  
  SMSC47B397 HARDWARE MONITOR DRIVER
@@@ -5264,6 -5272,46 +5284,46 @@@ F:    drivers/serial/sunsu.
  F:    drivers/serial/sunzilog.c
  F:    drivers/serial/sunzilog.h
  
+ SPEAR PLATFORM SUPPORT
+ M:    Viresh Kumar <viresh.kumar@st.com>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/plat-spear/
+ 
+ SPEAR3XX MACHINE SUPPORT
+ M:    Viresh Kumar <viresh.kumar@st.com>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/mach-spear3xx/
+ 
+ SPEAR6XX MACHINE SUPPORT
+ M:    Rajeev Kumar <rajeev-dlh.kumar@st.com>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/mach-spear6xx/
+ 
+ SPEAR CLOCK FRAMEWORK SUPPORT
+ M:    Viresh Kumar <viresh.kumar@st.com>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/mach-spear*/clock.c
+ F:    arch/arm/mach-spear*/include/mach/clkdev.h
+ F:    arch/arm/plat-spear/clock.c
+ F:    arch/arm/plat-spear/include/plat/clock.h and clkdev.h
+ 
+ SPEAR PAD MULTIPLEXING SUPPORT
+ M:    Viresh Kumar <viresh.kumar@st.com>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/plat-spear/include/plat/padmux.h
+ F:    arch/arm/plat-spear/padmux.c
+ F:    arch/arm/mach-spear*/spear*xx.c
+ F:    arch/arm/mach-spear*/include/mach/generic.h
+ F:    arch/arm/mach-spear3xx/spear3*0.c
+ F:    arch/arm/mach-spear3xx/spear3*0_evb.c
+ F:    arch/arm/mach-spear6xx/spear600.c
+ F:    arch/arm/mach-spear6xx/spear600_evb.c
+ 
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
  M:    Roger Wolff <R.E.Wolff@BitWizard.nl>
  S:    Supported
@@@ -5504,7 -5552,7 +5564,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/tmio_mmc.*
  
  TMPFS (SHMEM FILESYSTEM)
 -M:    Hugh Dickins <hugh.dickins@tiscali.co.uk>
 +M:    Hugh Dickins <hughd@google.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    include/linux/shmem_fs.h