Merge branch 'next/cleanup' into for-next

* next/cleanup:
  ARM: perf: move irq registration into pmu implementation
  ARM: perf: move CPU-specific PMU handling code into separate file
  ARM: perf: prepare for moving CPU PMU code into separate file
  ARM: perf: probe devicetree in preference to current CPU
  ARM: perf: remove mysterious compiler barrier
  ARM: pmu: remove arm_pmu_type enumeration
  ARM: pmu: remove unused reservation mechanism
  ARM: perf: add devicetree bindings for 11MPcore, A5, A7 and A15 PMUs
  ARM: PMU: Add runtime PM Support

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 8e7e05dfaac035022c3280515eca8acc01d2384f,0000000000000000000000000000000000000000..44b285ac246c0e58080da2f46acc885dd022782e
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,45 -1,0 +1,46 @@@
 +This file lists all branches that are pulled into the for-next branch
 +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +and their external dependencies.
 +
 +It also includes a couple of directly applied patches for build breaks with subject
 +The next/* branches are kept in the order in which they get applied.
 +
 +fixes:
 +
 +next/fixes-non-critical:
 +
 +next/cleanup:
 +cleanup/io-pci:   git://sources.calxeda.com/kernel/linux.git io-cleanup-pci-v2
 +bcmring/cleanup:  patches from Arnd
 +u300/cleanup    git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git u300-cleanup
 +csr/marco-prepare git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git marco-prepare
 +                      (includes two patches from clk-next that adds prima2 clocks)
++pmu/cleanup       git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.7
 +
 +next/maintainers:
 +
 +next/soc:
 +ux500/asic-id:        git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core
 +               + http://marc.info/?l=linux-arm-kernel&m=134667789927502
 +
 +next/dt:
 +pxa/dt:               git://github.com/hzhuang1/linux.git dt
 +
 +next/defconfig:
 +
 +next/drivers:
 +devel/led-driver      git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git for-arm-soc
 +at91/mci      git://github.com/at91linux/linux-at91 at91-for-next-soc
 +drivers/ocp2scp       patches from Kishon Vijay Abraham I <kishon@ti.com>
 +              + http://marc.info/?l=linux-next&m=134574365000518&w=2
 +
 +next/boards:
 +pxa/board     git://github.com/hzhuang1/linux.git board
 +
 +next/docs:
 +mvebu/docs:   git://github.com/MISL-EBU-System-SW/mainline-public.git marvell-doc
 +
 +
 +
 +
 +

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

diff --cc arch/arm/mach-realview/realview_eb.c
index 21661ade885ffd7f29c4d7d223332777cf275ce6,d7a6e9cebba4792d9306091bdf8e5c7043a69135..36f5d296131e832eb750a5a97998bb738fd297dc
--- 1/arch/arm/mach-realview/realview_eb.c
--- 2/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@@ -30,8 -30,8 +30,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
- #include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pb1176.c
index c0ff882c5cb865bb31ef3e07c5c498f0c9de11f7,361f898884c890ca2769267970b412dd53dce25f..049c3738777b701e766b07b56b35a9dd3050b2cd
--- 1/arch/arm/mach-realview/realview_pb1176.c
--- 2/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@@ -32,8 -32,8 +32,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
- #include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pb11mp.c
index 30779ae40c046a85cdb7456918f02812cc2bc451,c56bc8d4d11ba2730a67d50a775b9c706b397f14..9966672d86cdf9f74f8f692f3fa6f8ad24d2da71
--- 1/arch/arm/mach-realview/realview_pb11mp.c
--- 2/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@@ -30,8 -30,8 +30,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
- #include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pba8.c
index 081cd72c090e01ad41a106f86267958bbb3a7505,0409375824531e883fb2916ec9b2c888f24aa8e4..25fdc6b0135cdf067e527389f3bdb1d7ddff8f99
--- 1/arch/arm/mach-realview/realview_pba8.c
--- 2/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@@ -29,8 -29,8 +29,7 @@@
  #include <linux/io.h>
  
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
- #include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  

diff --cc arch/arm/mach-realview/realview_pbx.c
index 1ce62b9f846c2a1b306124b422c4fd9bd73b209a,97885dc11e8cb89575c96cc69fb07f7f9bb40dd9..05f28d853c706d825cca0f77960767494d4109ba
--- 1/arch/arm/mach-realview/realview_pbx.c
--- 2/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@@ -28,8 -28,8 +28,7 @@@
  #include <linux/io.h>
  
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
- #include <asm/pmu.h>
  #include <asm/smp_twd.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>

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