From: Tony Lindgren <tony@atomide.com>
Date: Tue, 20 Dec 2011 00:50:13 +0000 (-0800)
Subject: Merge branch 'linus' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b77965c9ca388837802debd238fa3d3e0fcd8de;p=pandora-kernel.git

Merge branch 'linus' into tmp-merge

Conflicts:
	arch/arm/kernel/setup.c
---

6b77965c9ca388837802debd238fa3d3e0fcd8de
Reading git-diff-tree failed