]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
Merge tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 14 Jun 2013 23:50:48 +0000 (16:50 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 14 Jun 2013 23:50:48 +0000 (16:50 -0700)
commit0d86331b4cc9b0c52d41bbe78cb4b75f40b7381c
tree0915ba9339ed5f0b9a8e8dabbe9faca9e8510c84
parentf54ffe0fef2b0bd635e2ee2738155fca70854675
parent807eba55f73e98b76d0afdc197d942c46122bdca
Merge tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers

From Linus Walleij:
Ux500 clocksource updates:
- Use relaxed readl() variant
- Fix a single comment

* tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  clocksource: dbx500-prcmu: comment cleanup
  clocksource: dbx500-prcmu: use relaxed readl variant

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