diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-22 09:20:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-22 09:20:34 +0200 |
| commit | ee7eafc907db64ef4cbe8a17da3a1089cbe50617 (patch) | |
| tree | 448cfbb1827083f875729135d4ab0d00b0f0752b /drivers/ata/pata_isapnp.c | |
| parent | Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/d... (diff) | |
| parent | cgroup: fix to break the while loop in cgroup_attach_task() correctly (diff) | |
| download | linux-ee7eafc907db64ef4cbe8a17da3a1089cbe50617.tar.xz linux-ee7eafc907db64ef4cbe8a17da3a1089cbe50617.zip | |
Merge branch 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo:
"Two late fixes for cgroup.
One fixes descendant walk introduced during this rc1 cycle. The other
fixes a post 3.9 bug during task attach which can lead to hang. Both
fixes are critical and the fixes are relatively straight-forward"
* 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: fix to break the while loop in cgroup_attach_task() correctly
cgroup: fix cgroup post-order descendant walk of empty subtree
Diffstat (limited to 'drivers/ata/pata_isapnp.c')
0 files changed, 0 insertions, 0 deletions