| commit | d3cdbbb329736130f4604a3821075e43477f173c | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Mon Jun 09 13:41:29 2014 -0400 |
| committer | Tejun Heo <tj@kernel.org> | Mon Jun 09 13:41:29 2014 -0400 |
| tree | 6145df399600ad0d8e161b6469edc097b7cfdde4 | |
| parent | 963649d735c8b6eb0f97e82c54f02426ff3f1f45 [diff] | |
| parent | c731ae1d0f02a300697a8b1564780ad28a6c2013 [diff] |
Merge branch 'for-3.16' into test-merge-for-3.16
Multiple conflicts due to the following two commits in cgroup branch.
ec903c0c858e ("cgroup: rename css_tryget*() to css_tryget_online*()")
5c9d535b893f ("cgroup: remove css_parent(")
Both commits, in themselves, are trivial and the conflicts can be
resolved by taking the code from the master side and then applying the
necessary renames.
Signed-off-by: Tejun Heo <tj@kernel.org>