| commit | 54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743 | [log] [tgz] |
|---|---|---|
| author | Jason Cooper <jason@lakedaemon.net> | Thu Jul 24 23:10:02 2014 +0000 |
| committer | Jason Cooper <jason@lakedaemon.net> | Thu Jul 24 23:10:02 2014 +0000 |
| tree | 924613494fac61514c0fc806920ed5032f2322a6 | |
| parent | b03e119fff8a06f55faaaa11c6259829fe81cbb4 [diff] | |
| parent | e53b1fd432497942a0fdfd0e89c3d30241cb4d2c [diff] |
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc Conflicts: arch/arm/mach-mvebu/pmsu.c