From: Arnd Bergmann Date: Thu, 21 Mar 2013 17:15:30 +0000 (+0100) Subject: Merge branch 'next/spring-cleaning' into for-next X-Git-Tag: next-20130322~14^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=13915107b44b4bb9033631764b6ef4f8c52f7ff3;p=karo-tx-linux.git Merge branch 'next/spring-cleaning' into for-next Conflicts: arch/arm/Kconfig arch/arm/Makefile --- 13915107b44b4bb9033631764b6ef4f8c52f7ff3