diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-03-15 03:17:33 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-15 03:17:33 -0400 |
commit | 12b8aeee3e51654fb95a3baff2e093f2513bb87d (patch) | |
tree | 73f78d62591b197cd53747e36a2f3d707b79a50b /include/linux/timex.h | |
parent | 25268498c9e07870323aead10751b7c6e99a3a78 (diff) | |
parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) |
Merge branch 'linus' into timers/core
Conflicts:
Documentation/feature-removal-schedule.txt
Merge reason: Resolve the conflict, update to upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/timex.h')
0 files changed, 0 insertions, 0 deletions