aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-05 16:53:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-05 16:53:43 -0800
commit40c043b077c6e377c8440d71563c055d0c4f0f0a (patch)
treee0c1d672a1156d7840d3ef650ba1aa963c68e13a /drivers/oprofile
parentMerge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentclockevents: Set noop handler in clockevents_exchange_device() (diff)
downloadlinux-dev-40c043b077c6e377c8440d71563c055d0c4f0f0a.tar.xz
linux-dev-40c043b077c6e377c8440d71563c055d0c4f0f0a.zip
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clockevents: Set noop handler in clockevents_exchange_device() tick-broadcast: Stop active broadcast device when replacing it clocksource: Fix bug with max_deferment margin calculation rtc: Fix some bugs that allowed accumulating time drift in suspend/resume rtc: Disable the alarm in the hardware
Diffstat (limited to 'drivers/oprofile')
0 files changed, 0 insertions, 0 deletions