From: Olof Johansson <olof@lixom.net>
Date: Tue, 7 Feb 2012 23:04:15 +0000 (-0800)
Subject: Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc
X-Git-Tag: v3.4-rc1~85^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13;p=pandora-kernel.git

Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc

There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c
---

a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13
Reading git-diff-tree failed