From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 9 Jan 2006 23:12:52 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1fd5a46dd6bbca3a1275465120caf4748872c2a7;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge /pub/scm/linux/kernel/git/davem/net-2.6
---

1fd5a46dd6bbca3a1275465120caf4748872c2a7