From: Grazvydas Ignotas <notasas@gmail.com>
Date: Wed, 6 Feb 2013 15:55:31 +0000 (+0200)
Subject: Merge branch 'stable-3.2' into pandora-3.2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1ea43bdfc45efbd4d0a7bd96b5a8389e4639537;p=pandora-kernel.git

Merge branch 'stable-3.2' into pandora-3.2

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

a1ea43bdfc45efbd4d0a7bd96b5a8389e4639537
Reading git-diff-tree failed