Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Fri, 2 May 2014 23:14:57 +0000 (02:14 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Fri, 2 May 2014 23:14:57 +0000 (02:14 +0300)
Conflicts:
arch/arm/mm/proc-v7.S


Trivial merge