]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
drivers/ata/ahci.c patch | diff1 | diff2 | blob | history

diff --cc drivers/ata/ahci.c
Simple merge
Linux kernel for KaRo TX COM modules