From: Grazvydas Ignotas <notasas@gmail.com>
Date: Wed, 20 Feb 2013 21:00:34 +0000 (+0200)
Subject: Merge branch 'stable-3.2' into pandora-3.2
X-Git-Tag: sz_154~188
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38b2b5209cd1535ff6a6d8c86080ea7d01fe71f2;p=pandora-kernel.git

Merge branch 'stable-3.2' into pandora-3.2

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

38b2b5209cd1535ff6a6d8c86080ea7d01fe71f2
Reading git-diff-tree failed