diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 14:01:47 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 14:01:47 -0800 |
| commit | 0dcfd9e33da3d61510bb10ab74df98c02122b955 (patch) | |
| tree | 1d9a4d823bb983261ae718d2157468f089373952 /lib/mpi/mpi-internal.h | |
| parent | f50f7070e5de59a168e45831c1e667f04583f563 (diff) | |
| parent | 8c4212418b54f360b21cf37b9caa1a226eb420f2 (diff) | |
Merge tag 'v3.20-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Merge "ARM: rockchip: soc updates for v3.20" from Heiko Stübner:
SoC parts of basic suspend support and removal of
Cortex-A9 reference from the machine name.
* tag 'v3.20-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: remove cpu-core name from machine name
ARM: rockchip: Add pmu-sram binding
ARM: rockchip: add suspend and resume for RK3288
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'lib/mpi/mpi-internal.h')
0 files changed, 0 insertions, 0 deletions