From: Olof Johansson <olof@lixom.net>
Date: Sun, 18 Dec 2011 04:05:50 +0000 (-0800)
Subject: Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
X-Git-Tag: v3.3-rc1~140^2~1^2^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d695cfa54e9ec48aeb149cadc8dab1240751572a;p=pandora-kernel.git

Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc

Conflicts:
	arch/arm/mach-tegra/board-dt.c

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

d695cfa54e9ec48aeb149cadc8dab1240751572a
Reading git-diff-tree failed