From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 28 Sep 2012 19:51:22 +0000 (+0200)
Subject: Merge branch 'bcmring/removal' into next/multiplatform
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~54^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e;p=pandora-kernel.git

Merge branch 'bcmring/removal' into next/multiplatform

The removal of bcmring has non-obvious commits with the way the
multiplatform configuration works, so merge it in here.

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-bcmring/arch.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e
Reading git-diff-tree failed