diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-05 01:41:09 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-05 01:41:09 +0300 |
| commit | 1f2dd7bcbfbef9030aff449eccde1328408b70d1 (patch) | |
| tree | d1bb851bc58744936a2fca0ab1f938eed4e6663f /fs/dlm/dir.h | |
| parent | 2c49e0250aaf4fba81b19c7bb9cb9b4e278e9a6d (diff) | |
| parent | 11bd57b82e6802765d1a1b33405bbaff82615d65 (diff) | |
| download | linux-1f2dd7bcbfbef9030aff449eccde1328408b70d1.tar.xz | |
Merge tag 'v3.19-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "first bunch on Rockchip dt changes" from Heiko Stübner:
First hunk of rockchip devicetree patches, containing:
- cpu operating points and supplies
- dma support for spi controllers
- i2s on rk3066 and rk3188
- default core clock settings for rk3288
* tag 'v3.19-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: Add SPI DMA into rk3288.dtsi
ARM: dts: rockchip: enable init rate for clock
ARM: dts: rockchip: add I2S controllers for rk3066 and rk3188
ARM: dts: rockchip: enable DMA on SPI for rk3066 and rk3188
ARM: dts: rockchip: add cpu supplies to boards
ARM: dts: rockchip: add operating points and armclk references
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/dlm/dir.h')
0 files changed, 0 insertions, 0 deletions