summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorLinus Torvalds2012-01-06 22:57:44 +0100
committerLinus Torvalds2012-01-06 22:57:44 +0100
commit376613e81ddc68f545fd5c87ffc3ad222b7abe5f (patch)
treee1cb1cd43d05f57e4584dd5f9ce3eb965d0ddff1 /drivers/hwmon
parentMerge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentMerge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jst... (diff)
downloadkernel-qcow2-linux-376613e81ddc68f545fd5c87ffc3ad222b7abe5f.tar.gz
kernel-qcow2-linux-376613e81ddc68f545fd5c87ffc3ad222b7abe5f.tar.xz
kernel-qcow2-linux-376613e81ddc68f545fd5c87ffc3ad222b7abe5f.zip
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, tsc: Skip TSC synchronization checks for tsc=reliable clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz clocksource: cris: Convert to clocksource_register_khz clocksource: xtensa: Convert to clocksource_register_hz/khz clocksource: um: Convert to clocksource_register_hz/khz clocksource: parisc: Convert to clocksource_register_hz/khz clocksource: m86k: Convert to clocksource_register_hz/khz time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver time: x86: Remove CLOCK_TICK_RATE from mach_timer.h time: x86: Remove CLOCK_TICK_RATE from tsc code time: Fix spelling mistakes in new comments time: fix bogus comment in timekeeping_get_ns_raw
Diffstat (limited to 'drivers/hwmon')
0 files changed, 0 insertions, 0 deletions