Merge branch 'depends/cleanup' into next/virt

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

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

diff --cc drivers/clocksource/Kconfig
Simple merge

diff --cc drivers/clocksource/Makefile
index e69511c4c66e284991247778673c13366e0d6296,440449c1ca21e139e7c5d79e19c0feab9934e550..49271105339f9aead1504955b93c0a81cf35e167
--- 1/drivers/clocksource/Makefile
--- 2/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -16,5 -17,6 +17,6 @@@ obj-$(CONFIG_CLKSRC_DBX500_PRCMU)     += cl
  obj-$(CONFIG_ARMADA_370_XP_TIMER)     += time-armada-370-xp.o
  obj-$(CONFIG_ARCH_BCM2835)    += bcm2835_timer.o
  obj-$(CONFIG_SUNXI_TIMER)     += sunxi_timer.o
+ obj-$(CONFIG_VT8500_TIMER)    += vt8500_timer.o
  
 -obj-$(CONFIG_CLKSRC_ARM_GENERIC)      += arm_generic.o
 +obj-$(CONFIG_ARM_ARCH_TIMER)          += arm_arch_timer.o