Merge branch 'stable-3.2' into pandora-3.2
authornotaz <notasas@gmail.com>
Sun, 13 Apr 2014 16:21:38 +0000 (19:21 +0300)
committernotaz <notasas@gmail.com>
Sun, 13 Apr 2014 16:21:38 +0000 (19:21 +0300)
Conflicts:
arch/arm/mm/proc-v7.S


Trivial merge