From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 Mar 2012 22:42:24 +0000 (+0000)
Subject: Merge branch 'next/fixes-non-critical' into next/drivers
X-Git-Tag: v3.4-rc1~86^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f907ab06bb021bcb91d39c8d1b36536ebdb318fa;p=pandora-kernel.git

Merge branch 'next/fixes-non-critical' into next/drivers

Conflicts:
	arch/arm/mach-lpc32xx/clock.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.

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

f907ab06bb021bcb91d39c8d1b36536ebdb318fa
Reading git-diff-tree failed