| commit | f69fcd3559e2b05b4a311b054233488e566a1f29 | [log] [tgz] |
|---|---|---|
| author | Jon Medhurst <tixy@linaro.org> | Wed Jul 18 19:42:23 2012 +0100 |
| committer | Jon Medhurst <tixy@linaro.org> | Wed Jul 18 19:42:23 2012 +0100 |
| tree | f573fc957325b65683ac3846dcd1c89fe23881cd | |
| parent | 2612181026933f4c72a76e3a0239915a322c0973 [diff] | |
| parent | e1a9cc09f7888e4787c0b12a8f9ea5676904d62a [diff] |
Merge branch 'tracking-armlt-tc2-pm' of git://git.linaro.org/landing-teams/working/arm/kernel into armlt-linaro-android-3.5 Conflicts: drivers/cpuidle/coupled.c drivers/misc/Kconfig drivers/misc/Makefile