| commit | 6e1af69780a4df749d28a129596ed576a0d7996c | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Thu Jan 16 09:44:34 2014 -0500 |
| committer | Tejun Heo <tj@kernel.org> | Thu Jan 16 09:44:34 2014 -0500 |
| tree | 67f0dee7b39c006dc305d7273db8222633603abf | |
| parent | a96cc303e42ad7830dde929aad0046e448a05505 [diff] | |
| parent | 55c82a6c2a513de1d8a20c3b3a769129a1a14d50 [diff] |
Merge branch 'for-3.13-fixes' into for-3.14 A scheduled horkage patch will conflict with HORKAGE changes in for-3.13-fixes. Pull in to avoid unnecessary merge conflicts. Signed-off-by: Tejun Heo <tj@kernel.org>