diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-19 22:27:05 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-19 23:29:01 -0700 |
| commit | 5fe0163aea863b1a5f79173619fdfe9e9baad299 (patch) | |
| tree | c49a6f58a3d3d71825cf77477e1e2702d2ffe103 /arch/arm/mach-mvebu/kirkwood-pm.h | |
| parent | 5df22a6148d7f073513a61eb306a98654c5a6fe8 (diff) | |
| parent | e7062b101537a0c4f4a8d725321772eb78100074 (diff) | |
Merge branch 'cleanup/kconfig' into next/soc
Bring in the cleanup branch due to conflicts in new additions. Should really
have been the base before the other branch, but this way works too.
* cleanup/kconfig:
ARM: qcom: clean-up unneeded kconfig selects
ARM: bcm: clean-up unneeded kconfig selects
ARM: mvebu: clean-up unneeded kconfig selects
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mvebu/kirkwood-pm.h')
0 files changed, 0 insertions, 0 deletions