diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:46:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:46:18 -0500 |
commit | 80a186074e72e2cd61f6716d90cf32ce54981a56 (patch) | |
tree | c5f75a83498df0ea2109067b797ec7986479dda0 /drivers/net/pppol2tp.c | |
parent | 15c989d4d14b82f43cae7efc6a7794cdd556f274 (diff) | |
parent | 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc (diff) |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix pick_next_highest_task_rt() for cgroups
sched: Cleanup: remove unused variable in try_to_wake_up()
x86: Fix sched_clock_cpu for systems with unsynchronized TSC
Diffstat (limited to 'drivers/net/pppol2tp.c')
0 files changed, 0 insertions, 0 deletions