Merge branch 'master' into tk71

Conflicts:
	arch/arm/mach-kirkwood/Makefile

diff --cc arch/arm/mach-kirkwood/Kconfig
Simple merge

diff --cc arch/arm/mach-kirkwood/Makefile
index f3a3c555f48fc7d90757540fb1c5ad21f2f5d129,5dcaa81a2ec39f0f6b60a13438651ab381fc6eb4..2cb84f5e3e9ff4dc83d8bf626c0a4868c3dd3f89
--- 1/arch/arm/mach-kirkwood/Makefile
--- 2/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@@ -10,12 -11,12 +11,13 @@@ obj-$(CONFIG_MACH_DOCKSTAR)                += docksta
  obj-$(CONFIG_MACH_TS219)              += ts219-setup.o tsx1x-common.o
  obj-$(CONFIG_MACH_TS41X)              += ts41x-setup.o tsx1x-common.o
  obj-$(CONFIG_MACH_OPENRD)             += openrd-setup.o
- obj-$(CONFIG_MACH_TK71)                       += tk71-setup.o
- obj-$(CONFIG_MACH_NETSPACE_V2)                += netspace_v2-setup.o
- obj-$(CONFIG_MACH_INETSPACE_V2)               += netspace_v2-setup.o
- obj-$(CONFIG_MACH_NETSPACE_MAX_V2)    += netspace_v2-setup.o
- obj-$(CONFIG_MACH_NET2BIG_V2)         += netxbig_v2-setup.o
- obj-$(CONFIG_MACH_NET5BIG_V2)         += netxbig_v2-setup.o
+ obj-$(CONFIG_MACH_NETSPACE_V2)                += netspace_v2-setup.o lacie_v2-common.o
+ obj-$(CONFIG_MACH_INETSPACE_V2)               += netspace_v2-setup.o lacie_v2-common.o
+ obj-$(CONFIG_MACH_NETSPACE_MAX_V2)    += netspace_v2-setup.o lacie_v2-common.o
+ obj-$(CONFIG_MACH_D2NET_V2)           += d2net_v2-setup.o lacie_v2-common.o
+ obj-$(CONFIG_MACH_NET2BIG_V2)         += netxbig_v2-setup.o lacie_v2-common.o
+ obj-$(CONFIG_MACH_NET5BIG_V2)         += netxbig_v2-setup.o lacie_v2-common.o
  obj-$(CONFIG_MACH_T5325)              += t5325-setup.o
++obj-$(CONFIG_MACH_TK71)                       += tk71-setup.o
  
  obj-$(CONFIG_CPU_IDLE)                        += cpuidle.o

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