aboutsummaryrefslogtreecommitdiff
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-25 13:11:00 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-25 13:11:00 +0100
commit5250d329e38cdf7580faeb9c53c17d3588d7d19c (patch)
tree42b2d22e0dc9ae08a26167ba8f89cb3d9a8ad5af /kernel/cgroup.c
parenta3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5 (diff)
parent468a15bb4cc61694495cc5ed7ffca29e87c79b69 (diff)
parent67be403d897f818b1a5ecc201967b0ee6a0332f9 (diff)
parent98db8df777438e16ad0f44a0fba05ebbdb73db8d (diff)
parent4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff)
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core