Merge branch 'jb_2.5' of git://codeaurora.org/kernel/msm into cm-10.1

Change-Id: I88f2c14f25c6ea7227763c1737d4dba294a092d4
d2: Fix and consolidate persistent_ram code

 * Move persistent_ram back to the end of lowmem. For some reason it is
   getting clobbered randomly at it's current location.
 * Also consolidate the code into devices-8960 where it can be shared.

Change-Id: Ie81670df15591b4c7505b0b356d04fca63bcac9e