From: Linus Torvalds Date: Thu, 8 Sep 2005 22:43:09 +0000 (-0700) Subject: Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0d6f9663b30a09ed725229b2d50391268c8538e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge kernel.org:/home/rmk/linux-2.6-i2c manually Old tree, so the automatic merge had some problems. --- c0d6f9663b30a09ed725229b2d50391268c8538e