summaryrefslogtreecommitdiff
path: root/kernel/time/ntp.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-15 08:17:33 +0100
committerIngo Molnar <mingo@elte.hu>2010-03-15 08:17:33 +0100
commit12b8aeee3e51654fb95a3baff2e093f2513bb87d (patch)
tree73f78d62591b197cd53747e36a2f3d707b79a50b /kernel/time/ntp.c
parent25268498c9e07870323aead10751b7c6e99a3a78 (diff)
parenta3d3203e4bb40f253b1541e310dc0f9305be7c84 (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 'kernel/time/ntp.c')
0 files changed, 0 insertions, 0 deletions