summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 23:46:18 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 23:46:18 +0100
commit80a186074e72e2cd61f6716d90cf32ce54981a56 (patch)
treec5f75a83498df0ea2109067b797ec7986479dda0 /net/ipv4
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentsched: Fix pick_next_highest_task_rt() for cgroups (diff)
downloadlinux-80a186074e72e2cd61f6716d90cf32ce54981a56.tar.xz
linux-80a186074e72e2cd61f6716d90cf32ce54981a56.zip
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 'net/ipv4')
0 files changed, 0 insertions, 0 deletions