From: Grazvydas Ignotas <notasas@gmail.com>
Date: Wed, 25 Apr 2012 22:07:00 +0000 (+0300)
Subject: Merge branch 'stable-3.2' into pandora-3.2
X-Git-Tag: sz_beta4~124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78facf6e7c74938f3aa06ebe7fa18077a450a94f;p=pandora-kernel.git

Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
	arch/arm/mm/proc-v7.S
---

78facf6e7c74938f3aa06ebe7fa18077a450a94f
Reading git-diff-tree failed