| commit | bcd44ddb29c7dead2fef3c3b052d5409193e9f49 | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Tue Sep 03 18:09:29 2013 -0400 |
| committer | Tejun Heo <tj@kernel.org> | Tue Sep 03 18:09:29 2013 -0400 |
| tree | dd2f2ad650e94fe843005bf70ceb9ebb3bd2e9fb | |
| parent | 2f01ea908bcf838e815c0124b579513dbda3b8c8 [diff] | |
| parent | d1625964da51bda61306ad3ec45307a799c21f08 [diff] |
Merge branch 'for-3.12' into test-merge-3.12 Conflicts: kernel/cgroup.c