Merge branch 'orion' into devel

* orion: (26 commits)
  [ARM] Orion: implement power-off method for QNAP TS-109/209
  [ARM] Orion: add support for QNAP TS-109/TS-209
  [ARM] Orion: I2C support
  [I2C] i2c-mv64xxx: Don't set i2c_adapter.retries
  [I2C] Split mv643xx I2C platform support
  [ARM] Orion: enable CONFIG_RTC_DRV_M41T80 for D-Link DNS-323
  [ARM] Orion defconfig
  [ARM] Orion: add support for Orion/MV88F5181 based D-Link DNS-323
  [ARM] Orion: MV88F5181 support bits
  [ARM] Orion: Buffalo/Revogear Kurobox Pro support
  [ARM] OrionNAS RD board support
  [ARM] Orion: support for Marvell Orion-2 (88F5281) Development Board
  [ARM] Orion: common platform setup for Gigabit Ethernet port
  [ARM] Orion: platform device registration for UART, USB and NAND
  [ARM] Orion: system timer support
  [ARM] Orion edge GPIO IRQ support
  [ARM] Orion: IRQ support
  [ARM] Orion: provide GPIO method for enabling hardware assisted blinking
  [ARM] Orion: GPIO support
  [ARM] Orion: programable address map support
  ...

Conflicts:

	arch/arm/Kconfig
	arch/arm/Makefile

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --cc arch/arm/Kconfig
index e53b0ed9d00a39718c2010f6bf44538f3df15742,a32b3b52c5c0352432adab748556ea052062fd50..6835a4c8affafd7810c36ca23ae1f84a9fe21467
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -967,7 -963,7 +979,7 @@@ config FPE_FASTFP
  
  config VFP
        bool "VFP-format floating point maths"
-       depends on CPU_V6 || CPU_ARM926T || CPU_V7
 -      depends on CPU_V6 || CPU_ARM926T || CPU_FEROCEON
++      depends on CPU_V6 || CPU_ARM926T || CPU_V7 || CPU_FEROCEON
        help
          Say Y to include VFP support code in the kernel. This is needed
          if your hardware includes a VFP unit.

diff --cc arch/arm/Makefile
index dd220d1898439c8ea7a89aa61897c10406a70328,2daa278149e0cdb89aeffe5d5a1651fb46e84676..7b8ff66febe1ffe27f9f734a3a7f45b58e86a464
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -139,7 -139,7 +139,8 @@@ endi
   machine-$(CONFIG_ARCH_KS8695)     := ks8695
    incdir-$(CONFIG_ARCH_MXC)      := mxc
   machine-$(CONFIG_ARCH_MX3)      := mx3
+  machine-$(CONFIG_ARCH_ORION)    := orion
 + machine-$(CONFIG_ARCH_MSM7X00A)   := msm
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge