summaryrefslogtreecommitdiffstats
path: root/include/linux/netfilter
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-15 16:55:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-15 16:55:00 -0800
commit7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (patch)
treedf325aa5755e73c83b26110a78cec1f2acd345b7 /include/linux/netfilter
parenta9f8d25b655c7b5e08c9ed67a2fd2fdbe79404a6 (diff)
parent6272d68cc6a5f90c6b1a2228cf0f67b895305d17 (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: sched_slice() fixlet sched: fix update_min_vruntime sched: SCHED_OTHER vs SCHED_IDLE isolation sched: SCHED_IDLE weight change sched: fix bandwidth validation for UID grouping Revert "sched: improve preempt debugging"
Diffstat (limited to 'include/linux/netfilter')
0 files changed, 0 insertions, 0 deletions