Merge branch 'linus' into timers/urgent
authorIngo Molnar <mingo@kernel.org>
Tue, 31 Jul 2012 15:05:27 +0000 (17:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 31 Jul 2012 15:05:27 +0000 (17:05 +0200)
commit1f815faec46e83bc96039797151846b60875bb06
tree41a874f8090e3f69c8a9f13e3c85dd7a371e569b
parentb44d50dcacea0d485ca2ff9140f8cc28ee22f28d
parente2b34e311be3a57c9abcb927e37a57e38913714c
Merge branch 'linus' into timers/urgent

Merge in Linus's branch which already has timers/core merged.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/time/timekeeping.c