From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Wed, 28 Jun 2006 18:06:39 +0000 (-0400)
Subject: Merge ../linux-2.6/
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f28e71617ddaf2483e3e5c5237103484a303743f;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge ../linux-2.6/

Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

f28e71617ddaf2483e3e5c5237103484a303743f