diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:30:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:30:28 -0700 |
| commit | 30cb6d5f2eb24d15d20139d5ceefaccc68734bd7 (patch) | |
| tree | 773c5a98645e4b945343caddcfe5af365566ccc5 /arch | |
| parent | 4867faab1e3eb8cc3f74e390357615d9b8e8cda6 (diff) | |
| parent | 68fa61c026057a39d6ccb850aa8785043afbee02 (diff) | |
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimers: Reorder clock bases
hrtimers: Avoid touching inactive timer bases
hrtimers: Make struct hrtimer_cpu_base layout less stupid
timerfd: Manage cancelable timers in timerfd
clockevents: Move C3 stop test outside lock
alarmtimer: Drop device refcount after rtc_open()
alarmtimer: Check return value of class_find_device()
timerfd: Allow timers to be cancelled when clock was set
hrtimers: Prepare for cancel on clock was set timers
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions