From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 21 Oct 2024 06:42:22 +0000 (+0200)
Subject: Merge 6.12-rc4 into char-misc-next
X-Git-Tag: v6.13-rc1~28^2~40
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d723c456ef5ad60d368e62791004fd152c4380aa;p=linux-block.git

Merge 6.12-rc4 into char-misc-next

We need the iio fixes from 6.12-rc4 in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

d723c456ef5ad60d368e62791004fd152c4380aa
diff --cc MAINTAINERS
index b1c25f0d8f9c,e9659a5a7fb3..ba4d3aaf5726
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11638,8 -11574,18 +11608,18 @@@ F:	drivers/crypto/intel/keembay/keembay
  F:	drivers/crypto/intel/keembay/ocs-hcu.c
  F:	drivers/crypto/intel/keembay/ocs-hcu.h
  
+ INTEL LA JOLLA COVE ADAPTER (LJCA) USB I/O EXPANDER DRIVERS
+ M:	Wentong Wu <wentong.wu@intel.com>
+ M:	Sakari Ailus <sakari.ailus@linux.intel.com>
+ S:	Maintained
+ F:	drivers/gpio/gpio-ljca.c
+ F:	drivers/i2c/busses/i2c-ljca.c
+ F:	drivers/spi/spi-ljca.c
+ F:	drivers/usb/misc/usb-ljca.c
+ F:	include/linux/usb/ljca.h
+ 
  INTEL MANAGEMENT ENGINE (mei)
 -M:	Tomas Winkler <tomas.winkler@intel.com>
 +M:	Alexander Usyskin <alexander.usyskin@intel.com>
  L:	linux-kernel@vger.kernel.org
  S:	Supported
  F:	Documentation/driver-api/mei/*