diff options
| author | Olof Johansson <olof@lixom.net> | 2012-07-27 22:56:57 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-07-27 22:56:57 +0200 |
| commit | 5c62202968d4aaf3bd50e19c421d66aec2e508e0 (patch) | |
| tree | 925d3102051db9664772911f29a59155825c671d /net/batman-adv/originator.c | |
| parent | Linux 3.5 (diff) | |
| parent | ARM: OMAP4: CPUidle: Open broadcast clock-event device. (diff) | |
| download | linux-5c62202968d4aaf3bd50e19c421d66aec2e508e0.tar.xz linux-5c62202968d4aaf3bd50e19c421d66aec2e508e0.zip | |
Merge branch 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into late2/pm
* 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm:
ARM: OMAP4: CPUidle: Open broadcast clock-event device.
ARM: OMAP4: CPUidle: add synchronization for coupled idle states
ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle.
ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus
Diffstat (limited to 'net/batman-adv/originator.c')
0 files changed, 0 insertions, 0 deletions