Merge remote-tracking branch 'arm-perf/for-next/perf'

Conflicts:
	arch/arm/kernel/hw_breakpoint.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
index fc49f3dabd7653624b7f9ccc8e78ef12b102d527,8154fab70de8404a5ea89f71b8f6f20e0056c9ff..6ff45d53362c1a0ef61d0806626829223f96e78e
--- 1/arch/arm/plat-samsung/devs.c
--- 2/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@@ -32,10 -32,7 +32,9 @@@
  #include <linux/platform_data/s3c-hsudc.h>
  #include <linux/platform_data/s3c-hsotg.h>
  
 +#include <media/s5p_hdmi.h>
 +
  #include <asm/irq.h>
- #include <asm/pmu.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>