Commit eb63b34b authored Aug 23, 2015 by Linus Torvalds

upstream-linus

Pull MIPS bug fixes from Ralf Baechle:
 "Two more fixes for 4.2.

  One fixes a build issue with the LLVM assembler - LLVM assembler macro
  names are case sensitive, GNU as macro names are insensitive; the
  other corrects a license string (GPL v2, not GPLv2) such that the
  module loader will recognice the license correctly"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  FIRMWARE: bcm47xx_nvram: Fix module license.
  MIPS: Fix LLVM build issue.

parents c4c53bad 72ccc89e

arch/mips/kernel/genex.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -407,7 +407,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
		.set noat
		SAVE_ALL
		FEXPORT(handle_\exception\ext)
		__BUILD_clear_\clear
		__build_clear_\clear
		.set at
		__BUILD_\verbose \exception
		move a0, sp

drivers/firmware/broadcom/bcm47xx_nvram.c

+1 −1

File changed.

Contains only whitespace changes.

Admin message