From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 01:07:46 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-perf/for-next/perf'
X-Git-Tag: next-20121003~93
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b22de6100c450615cda4c7c6844a4e046aee1c5;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/kernel/hw_breakpoint.c
	arch/arm/mach-bcmring/arch.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-ux500/cpu-db8500.c
---

1b22de6100c450615cda4c7c6844a4e046aee1c5