From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 22:44:17 +0000 (+0200)
Subject: Merge branch 'bcm/cleanup' into next/soc
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~44^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c;p=pandora-kernel.git

Merge branch 'bcm/cleanup' into next/soc

Conflicts:
	arch/arm/mach-bcm/Kconfig
---

80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c
Reading git-diff-tree failed