commit | e2efc25ac21ff3c8ead9670dffba40926aa54ad7 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Sat Feb 09 16:49:29 2013 -0800 |
committer | Olof Johansson <olof@lixom.net> | Sat Feb 09 16:49:29 2013 -0800 |
tree | ef77f8743cb80bf9d5b0e5512e8c69d9e25b7a97 | |
parent | 1087f4dbf368d7d800a1cae5b85aa600629d36e3 [diff] | |
parent | dbe1c3defb3844772634446492ea6c13882596ec [diff] |
Merge tag 'renesas-soc4-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc From Simon Horman: Fourth round of Renesas ARM-based SoC changes for v3.9 Register ARM architected timer. This is preparatory work by Magnus Damm for SoC(s) that use the ARM architected timer. * tag 'renesas-soc4-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Register ARM architected timer