diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-09 08:27:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 08:27:18 +0200 |
| commit | a44eb870f815356dac56adf3a380ee9b94787424 (patch) | |
| tree | db73f27f35f07f3da14595317b2b5315860bda83 /kernel | |
| parent | 68e90740284c69292881cd38c7ece6f09a18a58f (diff) | |
| parent | f51380a75652a4600b34ce384c4ff89ce0a15132 (diff) | |
| download | op-kernel-dev-a44eb870f815356dac56adf3a380ee9b94787424.zip op-kernel-dev-a44eb870f815356dac56adf3a380ee9b94787424.tar.gz | |
Merge branch 'clockevents/3.13' of git://git.linaro.org/people/dlezcano/linux into timers/core
Pull ARM clocksource/clockevents updates from Daniel Lezcano:
* Will Deacon and Sudeep KarkadaNagesha implemented the event stream
for architected timer. The event streams can be used to impose a
timeout on a wfe, to safeguard against any programming error in case
an expected event is not generated or even to implement wfe-based
timeouts for userspace locking implementations. Some files fall
under the arm maintainers' umbrella but those changes have been
reviewed and acked by the relevant people (Catalin Marinas and Olof
Johansson).
* Boris Brezillon improved the tcb_clksrc driver by removing a
deprecated flag, checking return code values and using functions
from the common clock framework.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions
