Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 6 Feb 2013 15:55:31 +0000 (17:55 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 6 Feb 2013 15:55:31 +0000 (17:55 +0200)
Conflicts:
drivers/mtd/ubi/attach.c


Trivial merge