diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 23:10:02 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 23:10:02 +0000 |
| commit | 54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743 (patch) | |
| tree | 924613494fac61514c0fc806920ed5032f2322a6 /arch/arm/mach-lpc32xx | |
| parent | b03e119fff8a06f55faaaa11c6259829fe81cbb4 (diff) | |
| parent | e53b1fd432497942a0fdfd0e89c3d30241cb4d2c (diff) | |
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc
Conflicts:
arch/arm/mach-mvebu/pmsu.c
Diffstat (limited to 'arch/arm/mach-lpc32xx')
0 files changed, 0 insertions, 0 deletions