From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 00:05:09 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-perf/for-next/perf'
X-Git-Tag: next-20120926~119
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8106359877f30967bc09fdd984fdbea6a5e32377;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/kernel/hw_breakpoint.c
---

8106359877f30967bc09fdd984fdbea6a5e32377
diff --cc arch/arm/plat-samsung/devs.c
index fc49f3dabd76,8154fab70de8..6ff45d53362c
--- a/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>