From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 18 Mar 2014 15:25:47 +0000 (+0100)
Subject: Merge branch 'cleanup/kconfig' into next/drivers
X-Git-Tag: v3.15-rc1~76^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d;p=pandora-kernel.git

Merge branch 'cleanup/kconfig' into next/drivers

This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.

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

a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d
Reading git-diff-tree failed