]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a96cc30 55c82a6)
Merge branch 'for-3.13-fixes' into for-3.14
authorTejun Heo <tj@kernel.org>
Thu, 16 Jan 2014 14:44:34 +0000 (09:44 -0500)
committerTejun Heo <tj@kernel.org>
Thu, 16 Jan 2014 14:44:34 +0000 (09:44 -0500)
commit6e1af69780a4df749d28a129596ed576a0d7996c
tree67f0dee7b39c006dc305d7273db8222633603abftree | snapshot
parenta96cc303e42ad7830dde929aad0046e448a05505commit | diff
parent55c82a6c2a513de1d8a20c3b3a769129a1a14d50commit | 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>
drivers/ata/ahci.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules