From: Olof Johansson <olof@lixom.net>
Date: Wed, 28 Mar 2012 04:21:44 +0000 (-0700)
Subject: Merge branch 'fixes-non-critical' into next/drivers2
X-Git-Tag: v3.4-rc1~73^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544;p=pandora-kernel.git

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

fixes-non-critical has already been merged upstream, and there are a
handful of annoying context conflicts that it makes sense to resolve
before sending up. Part of this is because there was parallel development
going on between more urgent fixes and general driver fixups, it should
settle down once the lpc32xx platform reaches a more steady state.

Conflicts:
	arch/arm/mach-lpc32xx/clock.c
	arch/arm/mach-lpc32xx/common.h

Signed-off-by: Olof Johansson <olof@lixom.net>
---

1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544
Reading git-diff-tree failed