summaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-14 06:59:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-14 06:59:11 +0200
commit95bc156c62a57cda1b225e03ae23eb2764ee1046 (patch)
tree8307f64b3727db3ca51c71d8f0a03e6b024721be /kernel/cgroup.c
parentMerge branch 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip (diff)
parenttile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files (diff)
downloadlinux-95bc156c62a57cda1b225e03ae23eb2764ee1046.tar.xz
linux-95bc156c62a57cda1b225e03ae23eb2764ee1046.zip
Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile
* 'stable' of git://github.com/cmetcalf-tilera/linux-tile: tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files
Diffstat (limited to 'kernel/cgroup.c')
0 files changed, 0 insertions, 0 deletions