diff options
| author | Linus Torvalds <[email protected]> | 2011-05-23 18:30:28 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-05-23 18:30:28 +0000 |
| commit | 30cb6d5f2eb24d15d20139d5ceefaccc68734bd7 (patch) | |
| tree | 773c5a98645e4b945343caddcfe5af365566ccc5 /drivers/usb/misc/usbtest.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff) | |
| parent | hrtimers: Reorder clock bases (diff) | |
| download | kernel-30cb6d5f2eb24d15d20139d5ceefaccc68734bd7.tar.gz kernel-30cb6d5f2eb24d15d20139d5ceefaccc68734bd7.zip | |
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 'drivers/usb/misc/usbtest.c')
0 files changed, 0 insertions, 0 deletions