Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sat, 22 Sep 2012 21:32:18 +0000 (00:32 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sat, 22 Sep 2012 21:32:18 +0000 (00:32 +0300)
Conflicts:
drivers/mtd/ubi/vtbl.c


Trivial merge