summaryrefslogtreecommitdiff
path: root/Documentation/cgroups
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-22 17:37:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-22 17:37:47 -0700
commitf5c101892fbd3d2f6d2729bc7eb7b3f6c31dbddd (patch)
treeae24f42e327c95af356cfa5ba407b1a7fad84fd5 /Documentation/cgroups
parentc54894cd4672d513e43e0d17d7b0387bf6b2c2c4 (diff)
parent641b695c2f11397bd307ea689d4d3f128360ce49 (diff)
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu updates from Tejun Heo: "Contains Alex Shi's three patches to remove percpu_xxx() which overlap with this_cpu_xxx(). There shouldn't be any functional change." * 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: remove percpu_xxx() functions x86: replace percpu_xxx funcs with this_cpu_xxx net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx
Diffstat (limited to 'Documentation/cgroups')
0 files changed, 0 insertions, 0 deletions