Merge tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

New feature development

This adds support for new features, and contains stuff from most
platforms. A number of these patches could have fit into other
branches, too, but were small enough not to cause too much
confusion here.

* tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
  mfd/db8500-prcmu: remove support for early silicon revisions
  ARM: ux500: fix the smp_twd clock calculation
  ARM: ux500: remove support for early silicon revisions
  ARM: ux500: update register files
  ARM: ux500: register DB5500 PMU dynamically
  ARM: ux500: update ASIC detection for U5500
  ARM: ux500: support DB8520
  ARM: picoxcell: implement watchdog restart
  ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C
  ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx <= ES2.1
  ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4
  ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3
  ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3
  ARM: Orion: Remove address map info from all platform data structures
  ARM: Orion: Get address map from plat-orion instead of via platform_data
  ARM: Orion: mbus_dram_info consolidation
  ARM: Orion: Consolidate the address map setup
  ARM: Kirkwood: Add configuration for MPP12 as GPIO
  ARM: Kirkwood: Recognize A1 revision of 6282 chip
  ARM: ux500: update the MOP500 GPIO assignments
  ...

diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge

diff --cc arch/arm/mach-dove/common.c
Simple merge

diff --cc arch/arm/mach-dove/common.h
Simple merge

diff --cc arch/arm/mach-kirkwood/common.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.h
Simple merge

diff --cc arch/arm/mach-mv78xx0/common.c
Simple merge

diff --cc arch/arm/mach-mv78xx0/common.h
Simple merge

diff --cc arch/arm/mach-omap2/clock3xxx_data.c
Simple merge

diff --cc arch/arm/mach-orion5x/common.c
index 41127e80cc1e961369679e91dd8c1e87196baf98,79ef693d2c0337c7fde754d6bc9cb23b7013a22a..0e28bae20bd4dfe88d57de429f54631f89d298a8
--- 1/arch/arm/mach-orion5x/common.c
--- 2/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@@ -15,10 -15,8 +15,9 @@@
  #include <linux/platform_device.h>
  #include <linux/dma-mapping.h>
  #include <linux/serial_8250.h>
- #include <linux/mbus.h>
  #include <linux/mv643xx_i2c.h>
  #include <linux/ata_platform.h>
 +#include <linux/delay.h>
  #include <net/dsa.h>
  #include <asm/page.h>
  #include <asm/setup.h>

diff --cc arch/arm/mach-orion5x/common.h
Simple merge

diff --cc arch/arm/mach-ux500/cpu-db5500.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/serial.h
Simple merge

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge