tree f5d2a84771b9d532f2fe99a9cf4e0b51f5432e26
parent 53d8ab29f8f6d67e37857b68189b38fa3d87dd8e
parent bf705ad0c364ea375b3a5e89fa8a0e1c1fde994c
author Linus Torvalds <torvalds@linux-foundation.org> 1391129885 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1391129885 -0800

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild changes from Michal Marek:
 - fix make -s detection with make-4.0
 - fix for scripts/setlocalversion when the kernel repository is a
   submodule
 - do not hardcode ';' in macros that expand to assembler code, as some
   architectures' assemblers use a different character for newline
 - Fix passing --gdwarf-2 to the assembler

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  frv: Remove redundant debugging info flag
  mn10300: Remove redundant debugging info flag
  kbuild: Fix debugging info generation for .S files
  arch: use ASM_NL instead of ';' for assembler new line character in the macro
  kbuild: Fix silent builds with make-4
  Fix detectition of kernel git repository in setlocalversion script [take #2]