Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic',...

diff --cc arch/arm/Kconfig
index 903c9c4bd68e1809777b7aa487193e59427577db,377a7a595b08041fdacb1dfd43d8be206578bda8,5b9f78b570e85c2f959c3d7fb1cda1bd70b2ac55,5b9f78b570e85c2f959c3d7fb1cda1bd70b2ac55,c9f69e0b1f5583e357afe277e0984522a935fece,5b9f78b570e85c2f959c3d7fb1cda1bd70b2ac55..9dd61014864b6cdba4c576de6f34c9e22c1fd229
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
--- 6/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@ -381,19 -378,18 -378,18 -378,18 -378,8 -378,18 +381,9 @@@@@@@ config ARCH_MX
        help
          Support for Freescale MXS-based family of processors
      
---- -config ARCH_STMP3XXX
---- -  bool "Freescale STMP3xxx"
---- -  select CPU_ARM926T
---- -  select CLKDEV_LOOKUP
---- -  select ARCH_REQUIRE_GPIOLIB
---- -  select GENERIC_CLOCKEVENTS
---- -  select USB_ARCH_HAS_EHCI
---- -  help
---- -    Support for systems based on the Freescale 3xxx CPUs.
---- -
      config ARCH_NETX
        bool "Hilscher NetX based"
 +++++  select CLKSRC_MMIO
        select CPU_ARM926T
        select ARM_VIC
        select GENERIC_CLOCKEVENTS

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_cp.c
Simple merge

diff --cc arch/arm/mach-realview/core.c
index 9f5155507d2760e2e7aa3bbdb6e723f4b27cf549,c8ec0888663395d2609b6abd0bce55f7be464e67,75dbc8791d05e5fea4df2da1407071a527f31c95,75dbc8791d05e5fea4df2da1407071a527f31c95,75dbc8791d05e5fea4df2da1407071a527f31c95,525ad17f8265e97baabbbd8ab2d7ce49035bd220..5c23450d2d1d40af01462bd4d765b49cc14e5845
--- 1/arch/arm/mach-realview/core.c
--- 2/arch/arm/mach-realview/core.c
--- 3/arch/arm/mach-realview/core.c
--- 4/arch/arm/mach-realview/core.c
--- 5/arch/arm/mach-realview/core.c
--- 6/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@@@@@@ -56,48 -56,28 -56,48 -56,48 -56,48 -56,29 +56,9 @@@@@@@
      
      #include "core.h"
      
----- #ifdef CONFIG_ZONE_DMA
----- /*
-----  * Adjust the zones if there are restrictions for DMA access.
-----  */
----- void __init realview_adjust_zones(unsigned long *size, unsigned long *hole)
----- {
-----   unsigned long dma_size = SZ_256M >> PAGE_SHIFT;
----- 
-----   if (!machine_is_realview_pbx() || size[0] <= dma_size)
-----           return;
----- 
-----   size[ZONE_NORMAL] = size[0] - dma_size;
-----   size[ZONE_DMA] = dma_size;
-----   hole[ZONE_NORMAL] = hole[0];
-----   hole[ZONE_DMA] = 0;
----- }
----- #endif
----- 
----- 
      #define REALVIEW_FLASHCTRL    (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_FLASH_OFFSET)
      
- ----static int realview_flash_init(void)
- ----{
- ----  u32 val;
- ----
- ----  val = __raw_readl(REALVIEW_FLASHCTRL);
- ----  val &= ~REALVIEW_FLASHPROG_FLVPPEN;
- ----  __raw_writel(val, REALVIEW_FLASHCTRL);
- ----
- ----  return 0;
- ----}
- ----
- ----static void realview_flash_exit(void)
- ----{
- ----  u32 val;
- ----
- ----  val = __raw_readl(REALVIEW_FLASHCTRL);
- ----  val &= ~REALVIEW_FLASHPROG_FLVPPEN;
- ----  __raw_writel(val, REALVIEW_FLASHCTRL);
- ----}
- ----
- ----static void realview_flash_set_vpp(int on)
+ ++++static void realview_flash_set_vpp(struct platform_device *pdev, int on)
      {
        u32 val;
      

diff --cc arch/arm/mach-versatile/core.c
Simple merge

diff --cc arch/arm/mach-vexpress/ct-ca9x4.c
Simple merge

diff --cc arch/arm/mach-vexpress/v2m.c
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc drivers/mtd/maps/Makefile
Simple merge