diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-18 09:26:44 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-18 09:27:46 -0700 |
commit | 88cf9c5e494795a53ec360d0b38f483a6d4e508f (patch) | |
tree | a5e62ef870083ad32ab9046153997b4c3badd236 /arch/arm/mach-kirkwood/common.h | |
parent | da0851fe3a8ebc416ab61ce50ef2fb3c3d7375c9 (diff) | |
parent | 92fd6e066a4ecdf161710afe6460bc372899ae5f (diff) | |
download | talos-op-linux-88cf9c5e494795a53ec360d0b38f483a6d4e508f.tar.gz talos-op-linux-88cf9c5e494795a53ec360d0b38f483a6d4e508f.zip |
Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dt
From Maxime Ripard:
Fourth round of dt additions for 3.10
There's only one late patch that merge together two clocks that were
already defined in a previous patch.
* tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux:
ARM: sunxi: unify osc24M_fixed and osc24M
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/common.h')
0 files changed, 0 insertions, 0 deletions