]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-4.1' into for-next
authorTejun Heo <tj@kernel.org>
Tue, 24 Mar 2015 18:27:42 +0000 (14:27 -0400)
committerTejun Heo <tj@kernel.org>
Tue, 24 Mar 2015 18:27:42 +0000 (14:27 -0400)
commit8c1d28989c1bd0bedba29e3a4c95e963c9225bc1
tree0273dc0a95b47ff6da3264a5742fe38c5b06671d
parent9ce509d99bb874f3f2f7fbadcdde81fb96c3dd2f
parent3a02824396c1df1db422d067b0fdcac724f44dd6
Merge branch 'for-4.1' into for-next

Conflicts:
include/linux/libata.h
include/linux/libata.h