diff options
| author | Vincent Guittot <vincent.guittot@linaro.org> | 2015-02-02 10:43:43 +0100 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2015-02-02 10:43:43 +0100 |
| commit | 30ae92e267453cc86953200c0f78db0b0995d631 (patch) | |
| tree | a8483337b13caa42036b9297170256924fc0b774 /lib | |
| parent | 2e081f000cef3f71c916bda9866bf3329c300ff3 (diff) | |
| parent | 20d24c44979f8f58b35c346777cce8753923c97c (diff) | |
Merge branch 'test-vexpress' into test-sched-cpuidle-tc2test-sched-cpuidle-tc2
Conflicts:
drivers/acpi/processor_idle.c
drivers/cpuidle/driver.c
drivers/cpuidle/dt_idle_states.c
drivers/cpuidle/governors/ladder.c
drivers/cpuidle/governors/menu.c
include/linux/cpuidle.h
include/linux/irq.h
kernel/irq/Makefile
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions