diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 12:58:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 12:58:50 -0400 |
| commit | f9db6e095115f9411b9647bdb9d81fe11f3d8b54 (patch) | |
| tree | 243cdffd9c49dffb909d17ec24614d93f527cc8b /kernel/cgroup.c | |
| parent | 3f27c0d2a469673e0f1efc8004b6f42428aa5b94 (diff) | |
| parent | c81fc2c331b8514ad112054cd2d87e6ec132286b (diff) | |
Merge branch 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clockevent: export register_device and delta2ns
clockevents: tick_broadcast_device can become static
Diffstat (limited to 'kernel/cgroup.c')
0 files changed, 0 insertions, 0 deletions