From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 22 Sep 2012 21:32:18 +0000 (+0300)
Subject: Merge branch 'stable-3.2' into pandora-3.2
X-Git-Tag: sz_release_152~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81e0a6ed9888d145d25b7ccece6e1016626bc3c2;p=pandora-kernel.git

Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
	drivers/mtd/ubi/vtbl.c
---

81e0a6ed9888d145d25b7ccece6e1016626bc3c2
Reading git-diff-tree failed