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)
commit78facf6e7c74938f3aa06ebe7fa18077a450a94f
tree3d6d9078346d33e4a1460464d58aba96434cbb8f
parentefacf4cede885cc9f50b1409ee7dda0ddbbf657c
parentb1be7dd1ec231ae751d0ce3acd0d2e5760704a6f
Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
arch/arm/mm/proc-v7.S
arch/arm/mm/proc-v7.S
security/commoncap.c