Merge tag 'cc-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char...
[firefly-linux-kernel-4.4.55.git] / Documentation / CodeOfConflict
2015-03-08 Linus TorvaldsMerge tag 'cc-4.0-rc2' of git://git./linux/kernel/git...
2015-02-27 Greg Kroah-HartmanCode of Conflict