From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 2 May 2014 23:14:57 +0000 (+0300)
Subject: Merge branch 'stable-3.2' into pandora-3.2
X-Git-Tag: sz_173~106
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a928e75172fe4bb3895033b2cbc569f4123aa86;p=pandora-kernel.git

Merge branch 'stable-3.2' into pandora-3.2

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

5a928e75172fe4bb3895033b2cbc569f4123aa86
Reading git-diff-tree failed