Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb8a4dea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull trivial tree updates from Jiri Kosina:
 "As usual, mostly comment, kerneldoc and printk() fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  lpfc: Grammar s/an negative/a negative/
  ARM: lib/lib1funcs.S: fix typo s/substractions/subtractions/
  cx25821: cx25821-medusa-reg.h: fix 0x0x prefix
  lib: crc-itu-t.[ch] fix 0x0x prefix in integer constants
  rapidio: Fix kerneldoc and comment
  qla4xxx: Fix printk() in qla4_83xx_read_reset_template() and qla4_83xx_pre_loopback_config()
  treewide: Kconfig: fix wording / spelling
  usb/serial: fix grammar in Kconfig help text for FTDI_SIO
  megaraid_sas: fix kerneldoc
  netfilter: ebtables: fix comment grammar
  drm/radeon: fix comment
  isdn: fix grammar in comment
  ARM: KVM: fix comment
parents 0faef837 79ce48df

arch/arm/include/asm/kvm_asm.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#define c0_MPIDR	1	/* MultiProcessor ID Register */

#define c0_CSSELR	2	/* Cache Size Selection Register */

#define c1_SCTLR	3	/* System Control Register */

#define c1_ACTLR	4	/* Auxilliary Control Register */

#define c1_ACTLR	4	/* Auxiliary Control Register */

#define c1_CPACR	5	/* Coprocessor Access Control */

#define c2_TTBR0	6	/* Translation Table Base Register 0 */

#define c2_TTBR0_high	7	/* TTBR0 top 32 bits */

arch/arm/lib/lib1funcs.S

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ Boston, MA 02111-1307, USA. */ 


#endif



	@ Perform all needed substractions to keep only the reminder.

	@ Perform all needed subtractions to keep only the reminder.

	@ Do comparisons in batch of 4 first.

	subs	\order, \order, #3		@ yes, 3 is intended here

	blt	2f
@@ -189,7 +189,7 @@ Boston, MA 02111-1307, USA. */ 
	teqne	\dividend, #0

	beq	5f



	@ Either 1, 2 or 3 comparison/substractions are left.

	@ Either 1, 2 or 3 comparison/subtractions are left.

2:	cmn	\order, #2

	blt	4f

	beq	3f

arch/arm64/include/asm/kvm_asm.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define	MPIDR_EL1	1	/* MultiProcessor Affinity Register */

#define	CSSELR_EL1	2	/* Cache Size Selection Register */

#define	SCTLR_EL1	3	/* System Control Register */

#define	ACTLR_EL1	4	/* Auxilliary Control Register */

#define	ACTLR_EL1	4	/* Auxiliary Control Register */

#define	CPACR_EL1	5	/* Coprocessor Access Control */

#define	TTBR0_EL1	6	/* Translation Table Base Register 0 */

#define	TTBR1_EL1	7	/* Translation Table Base Register 1 */

arch/xtensa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ config HAVE_SMP 
	  the CPU core definition and currently needs to be selected manually.



	  Multiprocessor support in implemented with external cache and

	  interrupt controlers.

	  interrupt controllers.



	  The MX interrupt distributer adds Interprocessor Interrupts

	  and causes the IRQ numbers to be increased by 4 for devices

drivers/gpu/drm/radeon/atombios.h

+2 −2
Original line number Diff line number Diff line
@@ -7944,8 +7944,8 @@ typedef struct { 
typedef struct {

  AMD_ACPI_DESCRIPTION_HEADER SHeader;

  UCHAR TableUUID[16];    //0x24

  ULONG VBIOSImageOffset; //0x34. Offset to the first GOP_VBIOS_CONTENT block from the beginning of the stucture.

  ULONG Lib1ImageOffset;  //0x38. Offset to the first GOP_LIB1_CONTENT block from the beginning of the stucture.

  ULONG VBIOSImageOffset; //0x34. Offset to the first GOP_VBIOS_CONTENT block from the beginning of the structure.

  ULONG Lib1ImageOffset;  //0x38. Offset to the first GOP_LIB1_CONTENT block from the beginning of the structure.

  ULONG Reserved[4];      //0x3C

}UEFI_ACPI_VFCT;