]> Pileus Git - ~andy/linux/commitdiff
Merge tag 'ux500-fixes-for-v3.8' of http://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 22:05:16 +0000 (14:05 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 22:05:28 +0000 (14:05 -0800)
From Linus Walleij:
- U9540 boot regression fix due to new clock framework
- Configure out the yet instable battery management driver
- Adjust cache initilization per SoC family

* tag 'ux500-fixes-for-v3.8' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Fix u9540 booting issues
  ARM: ux500: add spin_unlock(&master_lock).
  ARM: ux500: Disable Power Supply and Battery Management by default

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge