Commit eb75d05d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/cirrus-hp-g12' into for-linus 



Pull Cirrus HD-audio quirks for HP G12 laptops.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents ef9718b3 03c5c350

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com> 
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>

David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>

Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be 
		interrupt.



		This file switches between these two modes:

		- "mcu" makes the button press event be handled by the MCU to

		 - ``mcu`` makes the button press event be handled by the MCU to

		   change the LEDs panel intensity.

		- "cpu" makes the button press event be handled by the CPU.

		 - ``cpu`` makes the button press event be handled by the CPU.



		Format: %s.

Documentation/admin-guide/cifs/usage.rst

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and 
			  may use NTLMSSP               		0x00080

			  must use NTLMSSP           			0x80080

			  seal (packet encryption)			0x00040

			  must seal (not implemented yet)               0x40040

			  must seal                                     0x40040



cifsFYI			If set to non-zero value, additional debug information

			will be logged to the system error log.  This field

Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml

+6 −3
Original line number Diff line number Diff line
@@ -17,9 +17,12 @@ properties: 
    oneOf:

      # Samsung 13.3" FHD (1920x1080 pixels) eDP AMOLED panel

      - const: samsung,atna33xc20

      # Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel

      - items:

          - const: samsung,atna45af01

        - enum:

          # Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel

          - samsung,atna45af01

          # Samsung 14.5" 3K (2944x1840 pixels) eDP AMOLED panel

          - samsung,atna45dc02

        - const: samsung,atna33xc20



  enable-gpios: true

Documentation/devicetree/bindings/usb/microchip,usb2514.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
      - usb424,2412

      - usb424,2417

      - usb424,2514

      - usb424,2517



  reg: true