summaryrefslogtreecommitdiffstats
path: root/include/linux/jiffies.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-07-31 17:05:27 +0200
committerIngo Molnar <mingo@kernel.org>2012-07-31 17:05:27 +0200
commit1f815faec46e83bc96039797151846b60875bb06 (patch)
tree41a874f8090e3f69c8a9f13e3c85dd7a371e569b /include/linux/jiffies.h
parentb44d50dcacea0d485ca2ff9140f8cc28ee22f28d (diff)
parente2b34e311be3a57c9abcb927e37a57e38913714c (diff)
downloadlinux-stable-1f815faec46e83bc96039797151846b60875bb06.tar.gz
linux-stable-1f815faec46e83bc96039797151846b60875bb06.tar.bz2
linux-stable-1f815faec46e83bc96039797151846b60875bb06.zip
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>
Diffstat (limited to 'include/linux/jiffies.h')
0 files changed, 0 insertions, 0 deletions