Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 25 Apr 2012 22:07:00 +0000 (01:07 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 25 Apr 2012 22:07:00 +0000 (01:07 +0300)
Conflicts:
arch/arm/mm/proc-v7.S


Trivial merge