diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 09:46:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 09:46:15 -0700 |
| commit | 31bbb9b58d1e8ebcf2b28c95c2250a9f8e31e397 (patch) | |
| tree | 6bb0c0490d66d32eca43e73abb28d8b3ab0e7b91 /drivers/spi/mpc52xx_psc_spi.c | |
| parent | ff830b8e5f999d1ccbd0282a666520f0b557daa4 (diff) | |
| parent | 3f0a525ebf4b8ef041a332bbe4a73aee94bb064b (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:
itimers: Add tracepoints for itimer
hrtimer: Add tracepoint for hrtimers
timers: Add tracepoints for timer_list timers
cputime: Optimize jiffies_to_cputime(1)
itimers: Simplify arm_timer() code a bit
itimers: Fix periodic tics precision
itimers: Merge ITIMER_VIRT and ITIMER_PROF
Trivial header file include conflicts in kernel/fork.c
Diffstat (limited to 'drivers/spi/mpc52xx_psc_spi.c')
0 files changed, 0 insertions, 0 deletions