diff options
| author | Tejun Heo <tj@kernel.org> | 2014-01-16 14:44:34 (GMT) |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-01-16 14:44:34 (GMT) |
| commit | 6e1af69780a4df749d28a129596ed576a0d7996c (patch) | |
| tree | 67f0dee7b39c006dc305d7273db8222633603abf /Makefile | |
| parent | a96cc303e42ad7830dde929aad0046e448a05505 (diff) | |
| parent | 55c82a6c2a513de1d8a20c3b3a769129a1a14d50 (diff) | |
| download | linux-6e1af69780a4df749d28a129596ed576a0d7996c.tar.xz | |
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions